Skip to content

SRC fixes - #4341

Merged
plbossart merged 3 commits into
thesofproject:topic/sof-devfrom
ranj063:fix/src_formats
May 16, 2023
Merged

SRC fixes#4341
plbossart merged 3 commits into
thesofproject:topic/sof-devfrom
ranj063:fix/src_formats

Conversation

@ranj063

@ranj063ranj063 commented May 6, 2023

Copy link
Copy Markdown
Collaborator

No description provided.

@ranj063
ranj063 requested a review from singalsuMay 6, 2023 00:19
@ranj063
ranj063force-pushed the fix/src_formats branch 2 times, most recently from 82bbaac to f744f61CompareMay 6, 2023 00:59
bardliao
bardliao previously approved these changes May 8, 2023
View reviewed changes
singalsu
singalsu previously approved these changes May 8, 2023
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.

Tested a number of playback and capture SRC rates combinations 32/44.1/48/96 kHz and everything worked. (thesofproject/sof#7547, thesofproject/sof#7440 needed).

I assume similar change will be needed for ASRC.

@ranj063

ranj063 commented May 8, 2023

Copy link
Copy Markdown
CollaboratorAuthor

SOFCI TEST

plbossart
plbossart requested changes May 8, 2023
View reviewed changes

@plbossartplbossart left a comment

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.

not following this PR at all @ranj063@singalsu, too many hard-coded assumptions for me.

Comment threadsound/soc/sof/ipc4-topology.c
Comment threadsound/soc/sof/ipc4-topology.c
Comment threadsound/soc/sof/ipc4-topology.c
Comment threadsound/soc/sof/ipc4-topology.c Outdated
out_ref_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(in_fmt->fmt_cfg);
/*
* For playback, the SRC will only ever have a single output format based on what the DAI
* supports. The reference params will be ignored when choosing the only available format.

@plbossartplbossartMay 8, 2023

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.

it's also wrong to assume that the SRC output is related directly in a 1:1 manner to the DAI. We could perfectly have multiple stages with two SRC, one to go to 48kHz and a second to reach 192kHz.

Comment threadsound/soc/sof/ipc4-topology.c
@singalsusingalsu mentioned this pull request May 9, 2023
Merged
@ranj063
ranj063 dismissed stale reviews from singalsu and bardliao via 90b02b1May 9, 2023 15:14
@singalsusingalsu mentioned this pull request May 9, 2023
Open
bardliao
bardliao previously approved these changes May 10, 2023
View reviewed changes
ranj063 added 2 commits May 15, 2023 08:19
@ranj063
ASoC: SOF: ipc4-toplogy: Modify pipeline params based on SRC output f…
0f48bb9
…ormat
Modify the pipeline_params based on the SRC output format and set the
sink_rate in the IPC data.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063
ASoC: SOF: ipc4-topology: Fix the output reference params for SRC
0cb10a4
For playback, the SRC sink rate must be configured based on the requested
output format which is restricted to only handle DAI's that support a
single audio format for now. For capture, the SRC module should convert
the rate to match the rate requested by the PCM hw_params.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063
ASoC: SOF: ipc4-topology: Fix pipeline params at the output of copier
6707fa0
When we walk the list of connected widgets from the source to the sink
to prepare all widgets, the pipeline_params must be modified to reflect
the output audio format at each widget. But, the copier only modifies
the sample format in the pipeline_params. So, fix it to also modify the
rate and channels.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
plbossart
plbossart approved these changes May 15, 2023
View reviewed changes

@plbossartplbossart left a comment

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.

thanks @ranj063

singalsu
singalsu approved these changes May 16, 2023
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.

Works well, thanks @ranj063 !

@plbossart

plbossart commented May 16, 2023•
edited
Loading

Copy link
Copy Markdown
Member

big regression on ADLP_RVP_NOCODEC_IPC4ZPH https://sof-ci.01.org/linuxpr/PR4341/build4885/devicetest/index.html, is this a known issue @ranj063?

@ranj063

ranj063 commented May 16, 2023

Copy link
Copy Markdown
CollaboratorAuthor

big regression on ADLP_RVP_NOCODEC_IPC4ZPH https://sof-ci.01.org/linuxpr/PR4341/build4885/devicetest/index.html, is this a known issue @ranj063?

@plbossart I think there's an issue with that particular device. It fails on several PRs

@ranj063

ranj063 commented May 16, 2023

Copy link
Copy Markdown
CollaboratorAuthor

SOFCI TEST

@ranj063

ranj063 commented May 16, 2023

Copy link
Copy Markdown
CollaboratorAuthor

big regression on ADLP_RVP_NOCODEC_IPC4ZPH https://sof-ci.01.org/linuxpr/PR4341/build4885/devicetest/index.html, is this a known issue @ranj063?

@plbossart i ran the pr test manually https://sof-ci.ostc.intel.com/#/result/planresultdetail/25789 and it looks good.

@plbossart
plbossart merged commit 276d859 into thesofproject:topic/sof-devMay 16, 2023
@ranj063
ranj063 deleted the fix/src_formats branch May 16, 2023 22:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@plbossartplbossartplbossart approved these changes
@bardliaobardliaobardliao approved these changes
@singalsusingalsusingalsu approved these changes
@lgirdwoodlgirdwoodAwaiting requested review from lgirdwoodlgirdwood is a code owner
@kv2019ikv2019iAwaiting requested review from kv2019ikv2019i is a code owner
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@ujfalusiujfalusiAwaiting requested review from ujfalusiujfalusi is a code owner
@ajitkupandeyajitkupandeyAwaiting requested review from ajitkupandey
@kuanhsunchengkuanhsunchengAwaiting requested review from kuanhsuncheng
@yaochunhungyaochunhungAwaiting requested review from yaochunhung

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ranj063@plbossart@bardliao@singalsu