Skip to content

Some clean ups for the way we parse the available audio formats in topology#4163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 11 commits into from
Feb 8, 2023
Merged

Some clean ups for the way we parse the available audio formats in topology #4163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26d542d
ASoC: SOF: rename a couple of tokens
ranj063 Jan 30, 2023
cf6e9a5
ASoC: SOF: Use input/output pin consistently
ranj063 Feb 6, 2023
979b8eb
ASoC: SOF: ipc4-topology: Add a new field in struct sof_ipc4_availabl…
ranj063 Jan 31, 2023
22ef15f
ASoC: SOF: ipc4-topology: Do not parse the DMA_BUFFER_SIZE token
ranj063 Jan 31, 2023
262c46e
ASoC: SOF: ipc4-topology: Parse the SOF_COMP_TOKENS only once
ranj063 Jan 31, 2023
c7cd4e3
ASoC: SOF: ipc4-topology: Always parse the output formats in topology
ranj063 Jan 31, 2023
16754e7
ASoC: SOF: ipc4-topology: Modify the type of available input/output f…
ranj063 Jan 31, 2023
a2e1d34
ASoC: SOF: ipc4-topology: Modify the signature of sof_ipc4_init_audio…
ranj063 Feb 7, 2023
698e985
ASoC: SOF: ipc4-topology: Remove the ref_audio_fmt field
ranj063 Jan 31, 2023
5817b28
ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format …
ranj063 Feb 1, 2023
e9ce8b9
ASoC: SOF: ipc4-topology: Search only pin 0 formats
ranj063 Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions include/uapi/sound/sof/tokens.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,14 +89,17 @@
#define SOF_TKN_COMP_CPC 406
#define SOF_TKN_COMP_IS_PAGES 409
#define SOF_TKN_COMP_NUM_AUDIO_FORMATS 410
#define SOF_TKN_COMP_NUM_SINK_PINS 411
#define SOF_TKN_COMP_NUM_SOURCE_PINS 412
#define SOF_TKN_COMP_NUM_INPUT_PINS 411
#define SOF_TKN_COMP_NUM_OUTPUT_PINS 412
/*
* The token for sink/source pin binding, it specifies the widget
* name that the sink/source pin is connected from/to.
* The token for input/output pin binding, it specifies the widget
* name that the input/output pin is connected from/to.
*/
#define SOF_TKN_COMP_SINK_PIN_BINDING_WNAME 413
#define SOF_TKN_COMP_SRC_PIN_BINDING_WNAME 414
#define SOF_TKN_COMP_INPUT_PIN_BINDING_WNAME 413
Comment thread
ranj063 marked this conversation as resolved.
#define SOF_TKN_COMP_OUTPUT_PIN_BINDING_WNAME 414
#define SOF_TKN_COMP_NUM_INPUT_AUDIO_FORMATS 415
#define SOF_TKN_COMP_NUM_OUTPUT_AUDIO_FORMATS 416


/* SSP */
#define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500
Expand DownExpand Up@@ -173,17 +176,18 @@
/* CAVS AUDIO FORMAT */
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_RATE 1900
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_BIT_DEPTH 1901
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_VALID_BIT 1902
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_VALID_BIT_DEPTH 1902
Comment thread
ujfalusi marked this conversation as resolved.
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CHANNELS 1903
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CH_MAP 1904
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CH_CFG 1905
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE 1906
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG 1907
#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE 1908
#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX 1909
/* intentional token numbering discontinuity, reserved for future use */
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE 1930
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH 1931
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_VALID_BIT 1932
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_VALID_BIT_DEPTH 1932
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CHANNELS 1933
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CH_MAP 1934
#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CH_CFG 1935
Expand All@@ -197,6 +201,7 @@

/* COPIER */
#define SOF_TKN_INTEL_COPIER_NODE_TYPE 1980
#define SOF_TKN_INTEL_COPIER_DEEP_BUFFER_DMA_MS 1981
Comment thread
ranj063 marked this conversation as resolved.

/* ACP I2S */
#define SOF_TKN_AMD_ACPI2S_RATE 1700
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/ipc4-pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -504,7 +504,7 @@ static int sof_ipc4_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S32_LE);
}

rate->min = ipc4_copier->available_fmt.base_config->audio_fmt.sampling_frequency;
rate->min = ipc4_copier->available_fmt.input_pin_fmts->audio_fmt.sampling_frequency;
rate->max = rate->min;

switch (ipc4_copier->dai_type) {
Expand Down
Loading