From d813fb5ce7e095a9e7ef49f678e7b85a43551156 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 25 Jan 2024 09:43:04 +0800 Subject: [PATCH] Revert "HACK: To test 16KHz 24 bit capture" This reverts commit 5c6037d7913b969c81783f1a79347681ee8a09c8. --- .../topology2/include/common/pcm_caps.conf | 2 +- .../pipelines/cavs/host-gateway-capture.conf | 22 ++++------------ .../platform/intel/sdw-amp-generic.conf | 26 +++++++------------ .../production/tplg-targets-ace2.cmake | 5 ++-- 4 files changed, 18 insertions(+), 37 deletions(-) diff --git a/tools/topology/topology2/include/common/pcm_caps.conf b/tools/topology/topology2/include/common/pcm_caps.conf index 139565c91af2..949e7243e965 100644 --- a/tools/topology/topology2/include/common/pcm_caps.conf +++ b/tools/topology/topology2/include/common/pcm_caps.conf @@ -82,7 +82,7 @@ Class.PCM."pcm_caps" { # Default attribute values for PCM capabilities formats "S32_LE,S24_LE,S16_LE" - rate_min 16000 + rate_min 48000 rate_max 48000 periods_min 2 periods_max 16 diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf index 630e9559b0e9..c9a520f28b80 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf @@ -54,12 +54,9 @@ Class.Pipeline."host-gateway-capture" { } { in_bit_depth 32 - in_valid_bit_depth 24 + in_valid_bit_depth 32 in_channels 4 - in_rate 16000 - in_sample_type $SAMPLE_TYPE_MSB_INTEGER - in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" - in_ch_cfg $CHANNEL_CONFIG_MONO + in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 in_ch_map $CHANNEL_MAP_3_POINT_1 } ] @@ -80,30 +77,21 @@ Class.Pipeline."host-gateway-capture" { out_bit_depth 32 out_valid_bit_depth 24 out_channels 4 - out_rate 16000 - out_sample_type $SAMPLE_TYPE_MSB_INTEGER - out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" - out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 out_ch_map $CHANNEL_MAP_3_POINT_1 } { out_bit_depth 32 out_valid_bit_depth 32 out_channels 4 - out_rate 16000 - out_sample_type $SAMPLE_TYPE_MSB_INTEGER - out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" - out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 out_ch_map $CHANNEL_MAP_3_POINT_1 } { out_bit_depth 16 out_valid_bit_depth 16 out_channels 4 - out_rate 16000 - out_sample_type $SAMPLE_TYPE_MSB_INTEGER - out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" - out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 out_ch_map $CHANNEL_MAP_3_POINT_1 } ] diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf index 6ccdcd8e3fac..dd42f2a80e10 100644 --- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf @@ -224,7 +224,7 @@ IncludeByKey.NUM_SDW_AMP_LINKS { Object.Base.input_audio_format [ { in_bit_depth 32 - in_valid_bit_depth 24 + in_valid_bit_depth 32 in_sample_type $SAMPLE_TYPE_MSB_INTEGER in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" } @@ -293,7 +293,7 @@ IncludeByKey.NUM_SDW_AMP_LINKS { Object.Base.output_audio_format [ { out_bit_depth 32 - out_valid_bit_depth 24 + out_valid_bit_depth 32 out_sample_type $SAMPLE_TYPE_MSB_INTEGER out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" } @@ -409,7 +409,7 @@ IncludeByKey.SDW_AMP_FEEDBACK { direction "capture" name $SDW_SPK_IN_STREAM default_hw_conf_id 1 - rate 16000 + rate 48000 channels 2 Object.Base.hw_config.1 { @@ -449,21 +449,17 @@ IncludeByKey.SDW_AMP_FEEDBACK { { in_channels 4 in_bit_depth 32 - in_valid_bit_depth 24 - in_rate 16000 - in_ch_cfg $CHANNEL_CONFIG_MONO + in_valid_bit_depth 32 + in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 in_ch_map $CHANNEL_MAP_3_POINT_1 - in_sample_type $SAMPLE_TYPE_MSB_INTEGER - in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" } ] Object.Base.output_audio_format [ { out_channels 4 out_bit_depth 32 - out_valid_bit_depth 24 - out_rate 16000 - out_ch_cfg $CHANNEL_CONFIG_MONO + out_valid_bit_depth 32 + out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 out_ch_map $CHANNEL_MAP_3_POINT_1 out_sample_type $SAMPLE_TYPE_MSB_INTEGER out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" @@ -475,8 +471,7 @@ IncludeByKey.SDW_AMP_FEEDBACK { Object.Base.input_audio_format [ { in_bit_depth 32 - in_valid_bit_depth 24 - in_rate 16000 + in_valid_bit_depth 32 in_sample_type $SAMPLE_TYPE_MSB_INTEGER in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]" } @@ -484,8 +479,7 @@ IncludeByKey.SDW_AMP_FEEDBACK { Object.Base.output_audio_format [ { out_bit_depth 32 - out_valid_bit_depth 24 - out_rate 16000 + out_valid_bit_depth 32 out_sample_type $SAMPLE_TYPE_MSB_INTEGER out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]" } @@ -514,7 +508,7 @@ IncludeByKey.SDW_AMP_FEEDBACK { Object.PCM.pcm_caps.1 { name "amp feedback" - formats 'S16_LE,S24_LE,S32_LE' + formats 'S16_LE,S32_LE' channels_min $AMP_FEEDBACK_CH channels_max $AMP_FEEDBACK_CH } diff --git a/tools/topology/topology2/production/tplg-targets-ace2.cmake b/tools/topology/topology2/production/tplg-targets-ace2.cmake index 3bc70a66cd1a..552a0e29f448 100644 --- a/tools/topology/topology2/production/tplg-targets-ace2.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace2.cmake @@ -7,12 +7,11 @@ list(APPEND TPLGS DMIC0_ID=2,DMIC1_ID=3,NUM_HDMIS=0,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt711-4ch.bin" "cavs-sdw\;sof-lnl-rt711-l0-rt1316-l23-rt714-l1\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\ -NUM_HDMIS=0,SDW_SPK_STREAM=SDW2-Playback,SDW_SPK_IN_STREAM=SDW2-Capture,SDW_DMIC_STREAM=SDW1-Capture,\ -PASSTHROUGH=true,SDW_AMP_FMT_24=true" +NUM_HDMIS=0,SDW_SPK_STREAM=SDW2-Playback,SDW_SPK_IN_STREAM=SDW2-Capture,SDW_DMIC_STREAM=SDW1-Capture" "cavs-sdw\;sof-lnl-rt712-l2-rt1712-l3\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ -SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,PASSTHROUGH=true" +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" "cavs-sdw\;sof-lnl-rt722-l0\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\