ASoC: SOF: ipc-topology: Add float and 8-bit formats #5401
Conversation
singalsu
force-pushed
the
add_8bit_support
branch
from
09391c7 to
e1bfb75
Compare
singalsu
force-pushed
the
add_8bit_support
branch
from
e1bfb75 to
a5a5371
Compare
|
SOFCI TEST |
singalsu
force-pushed
the
add_8bit_support
branch
2 times, most recently
from
18cc681 to
a742f2c
Compare
|
I combined all the patches, not sure if this can be split to preparation and feature enable. I've tested this with script like below UPX i11 device with this kernel patch and firmware thesofproject/sof#9980. Then copied from DUT the nocodec loopback wav files and checked visually them with spectrogram in audio editor. The chirp should sound and look clean with all formats combinations. |
singalsu
requested review from
lgirdwood,
plbossart,
kv2019i,
dbaluta,
bardliao and
ujfalusi
as code owners
singalsu
force-pushed
the
add_8bit_support
branch
from
a742f2c to
9e2921c
Compare
|
No changes, just rebased and improved commit text to re-launch SOFCI. |
|
|
||
| _out_rate = fmt->sampling_frequency; | ||
| _out_channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg); | ||
| _out_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg); | ||
| _out_type = SOF_IPC4_AUDIO_FORMAT_CFG_SAMPLE_TYPE(fmt->fmt_cfg); |
There was a problem hiding this comment.
it is granted that the SOF_IPC4_AUDIO_FORMAT_CFG_SAMPLE_TYPE() for non 8 bit formats are always matching, right?
When used with older topologies where the type is not set.
There was a problem hiding this comment.
It looks like the sample type was first set in this December 2021 patch. The error would be with sample type not set.
commit 663174320904c0bc045f2d60cbe62035147c9736 (HEAD)
Author: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Sat Dec 11 21:03:50 2021 -0800
topology2: common: Add new class definition for audio_format
Add definition for audio format class for defining the input and output
audio formats for each components in cavs topology.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
It looks like the risk of encountering such topology is very low, only own tplg builds can be such. SOF v2.7 was first release for IPC4 and it was September 2023.
sound/soc/sof/ipc4-topology.c
Outdated
| if (params_format(fe_params) == SNDRV_PCM_FORMAT_S16_LE) | ||
| pipeline->msg.primary |= SOF_IPC4_GLB_CHAIN_DMA_SCS_MASK; | ||
|
|
||
| /* Set SCS bit for 8 and 16 bit formats */ | ||
| switch (params_format(fe_params)) { |
There was a problem hiding this comment.
if (params_physical_width(fe_params) <= 16)
pipeline->msg.primary |= SOF_IPC4_GLB_CHAIN_DMA_SCS_MASK;| return SOF_IPC4_TYPE_LSB_INTEGER; | ||
| default: | ||
| dev_err(sdev->dev, "invalid pcm sample type %d\n", params_format(params)); | ||
| return -EINVAL; |
There was a problem hiding this comment.
HDMI supports IEC958_SUBFRAME_LE, that should be not an error.
There was a problem hiding this comment.
I guess I'll add case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE: to return SOF_IPC4_TYPE_LSB_INTEGER though it isn't exactly right. I need to get his somehow tested, maybe with my TV and HDMI.
There was a problem hiding this comment.
@ujfalusi This seems to be called only for capture. I was never able to get SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE, since HDMI is only for playback. What do you think, should I remove the added case since it doesn't get executed?
As alternative way, this function could return by default SOF_IPC4_TYPE_LSB_INTEGER and only warn if ALSA PCM format is unknown. I don't know really what to do other than this conversion from ALSA to IPC4 needs to be done for 8-bit and next to-be-added float sample type.
singalsu
force-pushed
the
add_8bit_support
branch
from
9e2921c to
1ae4f3f
Compare
This patch enables use of 8-bit unsigned, A-law, and mu-law sample formats with IPC4 SOF. The ipc4-topology.h is updated with IPC4 sample types. The purpose is to to convert ALSA types to IPC4 types. The functions of_ipc4_update_hw_params(), sof_ipc4_get_valid_bits(), and new function sof_ipc4_get_sample_type() are updated to handle the sample type conversions. The function sof_ipc4_prepare_copier_module() is updated to set the DMA SCS bit for all non 32 bits sample types. The change to function sof_ipc4_get_valid_bits() returns 8 bits for these ALSA formats. The change to function sof_ipc4_prepare_copier_module() is needed to handle properly all non 32-bit formats with SCS bit set. To support playback with new 8 bits types, the sof_ipc4_init_input_audio_fmt() function is updated to get the sample type and use it in search for copier input pin format. To support capture, the sof_ipc4_init_output_audio_fmt() is updated similarly. Since the function uses separate out_ref_type argument, instead of single parameters struct, the out_ref_type needs to be added to every user of the function. Therefore functions sof_ipc4_prepare_copier_module(), sof_ipc4_prepare_gain_module(), sof_ipc4_prepare_mixer_module(), sof_ipc4_prepare_src_module(), and sof_ipc4_prepare_process_module() are updated to set the out_ref_type. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds support for FLOAT_LE ALSA type for playback and capture for IPC4 systems. Functions sof_ipc4_update_hw_params(), sof_ipc4_get_valid_bits() and sof_ipc4_get_sample_type() are updated to handle SOF_IPC4_TYPE_FLOAT and SNDRV_PCM_FORMAT_FLOAT_LE. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
singalsu
force-pushed
the
add_8bit_support
branch
from
1ae4f3f to
9b13ced
Compare
singalsu
changed the title
See commit messages for the changes.