Merge pull request #10 from laklimov/main

Updates to compressed playback support
linux-msm · Mar 11, 2025 · de45cea · de45cea
2 parents f4ac232 + 7614bf8
commit de45cea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/audioreach/subgraph-compress-stream-vol-playback.m4 b/audioreach/subgraph-compress-stream-vol-playback.m4
@@ -30,7 +30,7 @@ undefine(`CONT_STACK_SIZE') dnl
 define(`PCM_PERF_MODE', APM_SG_PERF_MODE_LOW_LATENCY) dnl'
 define(`PCM_DIRECTION', APM_SUB_GRAPH_DIRECTION_RX) dnl'
 define(`CONT_SENARIO_ID', APM_SUB_GRAPH_SID_AUDIO_PLAYBACK) dnl'
-define(`CONT_CAP', APM_CONTAINER_CAP_ID_CD) dnl'
+define(`CONT_CAP', `ifelse(LPASS_VER_COMPAT, 110000, APM_CONTAINER_TYPE_ID_GC, APM_CONTAINER_CAP_ID_CD)') dnl'
 define(`CONT_POSITION', APM_CONT_GRAPH_POS_STREAM) dnl'
 define(`PCM_DOMAIN_ID', APM_PROC_DOMAIN_ID_ADSP) dnl'
 define(`CONT_STACK_SIZE', 8192) dnl'
@@ -63,7 +63,7 @@ AR_COMPESS_PLAYBACK(PCM_DAI_ID, PCM_FORMAT, PCM_MIN_RATE, PCM_MAX_RATE, PCM_MIN_
 
 AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CONT_SENARIO_ID)
 
-AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
+AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
 AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 1, 2, PCM_DAI_ID, PHDEC_MODULE_IID)
 AR_MODULE_PLACEHOLDER_DECODER(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PHDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED,PCMCNV_MODULE_IID)

diff --git a/util/pcm.m4 b/util/pcm.m4
@@ -58,28 +58,28 @@ define(`AR_PCM_CAPTURE',
 dnl AR_COMPESS_PLAYBACK(index, formats, rate_min, rate_max, ch_min, ch_max)
 define(`AR_COMPESS_PLAYBACK',
 `'
-`SectionPCMCapabilities."MultiMedia$1 Playback" {'
+`SectionPCMCapabilities."`MultiMedia'eval($1 +1 )` Playback'" {'
 `        formats STR($2)'
 `        rate_min STR($3)'
 `        rate_max STR($4)'
 `        channels_min STR($5)'
 `        channels_max STR($6)'
 `}'
 `'
-`SectionPCM."MultiMedia$1 Playback" {'
+`SectionPCM."`MultiMedia'eval($1 + 1)` Playback'" {'
 `'
 `        index STR($1)'
 `        compress "true"'
 `'
 `        # used for binding to the PCM'
 `        id STR($1)'
 `'
-`        dai."MultiMedia$1 Playback" {'
+`        dai."`MultiMedia'eval($1 + 1)` Playback'" {'
 `                id STR($1)'
 `        }'
 `'
 `        pcm."playback" {'
-`                capabilities "MultiMedia$1 Playback"'
+`                capabilities "`MultiMedia'eval($1 + 1)` Playback'"'
 `        }'
 `}') dnl
 dnl