Skip to content

ipc4: add S24_3LE for ipc4 - #5198

Merged
lgirdwood merged 6 commits into
thesofproject:mainfrom
RanderWang:s24_3le
Jan 26, 2022
Merged

ipc4: add S24_3LE for ipc4#5198
lgirdwood merged 6 commits into
thesofproject:mainfrom
RanderWang:s24_3le

Conversation

@RanderWang

@RanderWangRanderWang commented Jan 12, 2022

Copy link
Copy Markdown
Collaborator

S24_3LE is not a native supported format for hda dma. Driver
treats it as 16bit stream or 8bit stream, .e.g. 24bit 3LE
2ch stream will be set as 16bit 3ch stream. In FW side,
24bit stream will be converted to S24LE.

Currently HIFI3 optimization is not supported now and also
S24_LE unit test is not implemented. These will be supported
later.
Tested on windows platform.

lgirdwood
lgirdwood reviewed Jan 12, 2022
View reviewed changes

@lgirdwoodlgirdwood left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good update to support the new format but lets check the conversions. We can add the HiFi3/4 versions in a subsequent PR.

Comment threadsrc/audio/Kconfig Outdated
Comment threadsrc/audio/pcm_converter/pcm_converter_generic.c Outdated
ranj063
ranj063 reviewed Jan 13, 2022
View reviewed changes
Comment threadsrc/include/sof/audio/format.h Outdated
@RanderWang

RanderWang commented Jan 13, 2022

Copy link
Copy Markdown
CollaboratorAuthor

updated, thanks!

singalsu
singalsu requested changes Jan 13, 2022
View reviewed changes

@singalsusingalsu left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The s24c32 without sign extend is a risk, better to fix it.

Comment threadsrc/audio/pcm_converter/pcm_converter_generic.c Outdated
Comment threadsrc/audio/pcm_converter/pcm_converter_generic.c Outdated
singalsu
singalsu reviewed Jan 13, 2022
View reviewed changes
Comment threadsrc/audio/pcm_converter/pcm_converter_generic.c Outdated
@RanderWang
RanderWangforce-pushed the s24_3le branch 4 times, most recently from ea792a0 to 1435ef8CompareJanuary 18, 2022 12:36
@lgirdwood

lgirdwood commented Jan 18, 2022

Copy link
Copy Markdown
Member

@singalsu good for you ?
@RanderWang can you rebase ? We have a conflict.

@RanderWang
ipc4: remove redundant calculation for copy info
0191c34
The src & sink info can be gotten from struct comp_copy_limits,
no need to calculate it again.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang
ipc4: fix compiling issue for ipc4
f9bc85d
Move endif to include general ipc4 conversion.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang
ipc4: adjust pcm conversion function for gateway
c49f8ab
Compared to non-copier module, copier module uses
different conversion algorithoms for different
gateways, .e.g HDA dma requires sample bit starting
from MSB bits and also alh engine. These hw features
make pcm conversion algorithom different for different
modules.
This patch add gateway type to select conversion function.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang
ipc4: change frame_fmt and valid_sample_fmt for gateway
1f303e2
First we reused ipc3 pcm conversion function by by setting
frame_fmt to S24_4LE, but later found that we need different
conversion for copier with gateways support.
Now frame_fmt will be set by default config.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang
ipc4: add pcm conversion support for link dma & alh
21542cf
For HDA gateway, 24bits sample will be in high 24bits with
32 bits container case. Alh requires 32 bits container and
all sample bits starting from bit 31 to bit 0.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang
ipc4: add general S24_3LE support
a0a5aff
S24_3LE is not a native supported format for hda dma. Driver
treats it as 16bit stream or 8bit stream, .e.g. 24bit 3LE
2ch stream will be set as 16bit 3ch stream. In FW side,
24bit stream will be converted to S24LE.
Currently HIFI3 optimization is not supported now and also
S24_LE unit test is not implemented. These will be supported
later.
Tested on windows platform.
Signed-off-by: Rander Wang <rander.wang@intel.com>
@RanderWang

RanderWang commented Jan 19, 2022

Copy link
Copy Markdown
CollaboratorAuthor

updated, thanks

lyakh
lyakh reviewed Jan 20, 2022
View reviewed changes
Comment threadsrc/include/ipc4/gateway.h
@mwasko

mwasko commented Jan 20, 2022

Copy link
Copy Markdown
Contributor

@marcinszkudlinski fyi

@lgirdwood
lgirdwood merged commit 8ed3bce into thesofproject:mainJan 26, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lyakhlyakhlyakh left review comments
@ranj063ranj063ranj063 left review comments
@lgirdwoodlgirdwoodlgirdwood approved these changes
@singalsusingalsusingalsu approved these changes
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@lbetlejlbetlejAwaiting requested review from lbetlejlbetlej is a code owner
@mmaka1mmaka1Awaiting requested review from mmaka1mmaka1 is a code owner
@plbossartplbossartAwaiting requested review from plbossartplbossart is a code owner
@marcinszkudlinskimarcinszkudlinskiAwaiting requested review from marcinszkudlinski
+1 more reviewer
@andrula-songandrula-songandrula-song left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@RanderWang@lgirdwood@mwasko@lyakh@ranj063@singalsu@andrula-song