Skip to content
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.

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

topology2: deep-buffer: Add second instance #8430

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Conversation

yongzhi1
Copy link
Contributor

@yongzhi1 yongzhi1 commented Nov 1, 2023

Add 2nd deepbuff PCM as an option.

@yongzhi1 yongzhi1 marked this pull request as draft November 1, 2023 22:27
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Deepbuffer 2 Volume'
Copy link
Member

Choose a reason for hiding this comment

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

probably best to find a different name with a parameter

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ack

@yongzhi1 yongzhi1 marked this pull request as ready for review November 2, 2023 14:45
@yongzhi1
Copy link
Contributor Author

yongzhi1 commented Nov 2, 2023

V2 update:

  1. Use "Pre Mixer $PCM Volume" format for gain's names.
  2. Add default value for DEEP_BUF_2.

"true" {
Object.Pipeline.deepbuffer-playback [
{
index $DEEP_BUFFER_PIPELINE_ID_2
Copy link
Collaborator

Choose a reason for hiding this comment

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

where is this defined? Don't you need defaults for this and all the *_2's below?

Copy link
Contributor Author

@yongzhi1 yongzhi1 Nov 3, 2023

Choose a reason for hiding this comment

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

I am thinking to add those in the parent conf (ie cavs_rt5682.c) in another patch with DEEP_BUF_2=true for the target tplg:

+	DEEP_BUFFER_PIPELINE_ID_2	35
+	DEEP_BUFFER_PCM_ID_2		51
+	DEEP_BUFFER_PIPELINE_SRC_2		'mixin.35.1'
+	DEEP_BUFFER_PIPELINE_SINK_2	'mixout.4.1'
+	DEEP_BUFFER_PCM_NAME_2		'Deepbuffer Amps'

@yongzhi1 yongzhi1 force-pushed the db2 branch 2 times, most recently from 7e9af58 to 7d1a8e9 Compare November 3, 2023 18:18
@yongzhi1
Copy link
Contributor Author

yongzhi1 commented Nov 3, 2023

V3 update:

  • Add PCM35 to sof-mtl-max98357a-rt5682 topology.

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

@ranj063 LGTM, but needs your approval.

@@ -57,14 +57,14 @@ PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,\
DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1"
DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_2=true"
Copy link
Member

Choose a reason for hiding this comment

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

Long term, we need a better name or flag to say a PCM is deep buffer i.e. DEEP_BUFFER_HP=true. Not a blocker for this PR though, can be looked at later.

Choose a reason for hiding this comment

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

+1. DEEP_BUFFER_HP=true & DEEP_BUFFER_SPK= true gives better understanding

Copy link
Contributor Author

@yongzhi1 yongzhi1 Nov 14, 2023

Choose a reason for hiding this comment

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

Ack, will update DEEP_BUFFER_2 to DEEP_BUFFER_SPK.
so far we have single deepbuf PCM, DEEPBUFFER_FW_DMA_MS is used to represent DEEP_BUFFER_HP, can we use a seperate PR to add DEEP_BUFFER_HP since it will touch more files? Thanks,

Add 2nd deepbuff PCM as an option.

Signed-off-by: Yong Zhi <[email protected]>
Add deep buffer PCM35 on amps for sof-mtl-max98357a-rt5682 tplg.

Signed-off-by: Yong Zhi <[email protected]>
@yongzhi1
Copy link
Contributor Author

UPDATE:

  • renamed DEEP_BUF_2 to DEEP_BUF_SPK.

@lgirdwood lgirdwood merged commit 8b1a01f into thesofproject:main Nov 17, 2023
38 checks passed
@yongzhi1 yongzhi1 deleted the db2 branch November 17, 2023 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants