[SOF-2.7] Add 24bit msb support#8171
Merged
kv2019i merged 5 commits intothesofproject:stable-v2.7from Sep 7, 2023
Merged
Conversation
It is missed in kconfig. Signed-off-by: Rander Wang <rander.wang@intel.com> (cherry picked from commit 67f9862)
For sample format with 24 bits valid sample bit and 32 bits container, valid sample is at msb 24bits if IPC4_TYPE_MSB_INTEGER is set. Signed-off-by: Rander Wang <rander.wang@intel.com> (cherry picked from commit ea10065)
Remove gateway type and direction for pcm conversion check and will move them to copier module. This will make pcm conversion check more general and simple. Also remove s16/c32 for gateway since it is never used. Signed-off-by: Rander Wang <rander.wang@intel.com> (cherry picked from commit eec45d1)
At first the sample type is set to MSB_INTEGER to follow windows settings, but actually we use LSB_INTERGER type such as S24_4LE. Now change the default sample type to LSB_INTERGER to align with FW usage. For DAI copier we need to use MSB_INTERGER for hardware requirement. Currently sample type only affect s24/c32 case, so only change sample type in dai for this format config. FW will use sample type to choose correct format conversion function and can deal with Windows audio stream correctly with MSB s24/c32 format. out_fmt_cfg is redefined for a alsa-lib bug. Alsa-lib will first process out_fmt_cfg = '$[($out_channels | ($out_valid_bit_depth * 256)) | ($out_sample_type * 65536)]' in base class and then deal with out_sample_type, so error is reported. Now first define out_sample_type and then out_fmt_cfg, everything works. Signed-off-by: Rander Wang <rander.wang@intel.com> (cherry picked from commit fc8a4b6)
Adjust valid format in copier for some types of dai gateway which need to use MSB type. Currently sample type only affect the copier module so we don't do it in audio_stream_fmt_conversion. Signed-off-by: Rander Wang <rander.wang@intel.com> (cherry picked from commit 65b2e0b)
kv2019i
requested review from
a team,
RanderWang,
abonislawski,
dbaluta,
jsarha,
lbetlej,
lgirdwood,
marcinszkudlinski,
mmaka1,
pblaszko,
plbossart and
ranj063
as code owners
Collaborator
Author
|
@RanderWang Can you verify I did the backport looks good? |
RanderWang
approved these changes
Sep 7, 2023
Collaborator
RanderWang
left a comment
RanderWang
left a comment
There was a problem hiding this comment.
@kv2019i Thanks! Perfect!
Collaborator
Author
|
One pause-resume fail in https://sof-ci.01.org/sofpr/PR8171/build12665/devicetest is a DUT issue related to dmic. This can be ignored. Rest of tests pass. as this was already reviewed in mainline, proceeding with merge. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #8151