Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tools/topology/topology2/cavs-sdw.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<deepbuffer-playback.conf>
<deepbuffer-capture.conf>
<compr-playback.conf>
<compr-speed-playback.conf>
<host-gateway-playback.conf>
<host-gateway-capture.conf>
<host-gateway-tdfb-drc-capture.conf>
Expand Down Expand Up @@ -98,6 +99,11 @@ Define {
COMPR_2_PIPELINE_SINK 'mixout.21.1'
COMPR_2_PCM_NAME 'Compress Speaker'

COMPR_SPEED_PIPELINE_SINK 'mixout.1.1'
COMPR_SPEED_PCM_NAME 'Compress Speed Jack Out'
COMPR_SPEED_2_PIPELINE_SINK 'mixout.21.1'
COMPR_SPEED_2_PCM_NAME 'Compress Speed Speaker'

SDW_JACK_OUT_STREAM 'SDW0-Playback'
SDW_JACK_IN_STREAM 'SDW0-Capture'
SDW_JACK_OUT_BE_ID 0
Expand Down Expand Up @@ -238,6 +244,7 @@ IncludeByKey.SDW_JACK {
Define {
# disable compressed audio for Jack
COMPRESSED_1 false
COMPRESSED_SPEED_1 false
}
}
}
Expand All @@ -247,6 +254,7 @@ IncludeByKey.NUM_SDW_AMP_LINKS {
Define {
# Enable compressed audio for Speaker
COMPRESSED_2 true
COMPRESSED_SPEED_2 true
}
}
}
Expand Down Expand Up @@ -287,3 +295,6 @@ IncludeByKey.SDW_DMIC_AUDIO_FEATURE_CAPTURE {
IncludeByKey.SDW_DMIC_COMPR_AUDIO_FEATURE_CAPTURE {
"true" "platform/intel/sdw-dmic-audio-feature-compress.conf"
}
IncludeByKey.COMPRESSED_SPEED {
"true" "platform/intel/compr-speed.conf"
}
8 changes: 8 additions & 0 deletions tools/topology/topology2/development/tplg-targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,17 @@ SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"
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,COMPRESSED=true"

"cavs-sdw\;sof-arl-cs42l43-l0-compr-speed\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=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,\
COMPRESSED=true,COMPRESSED_SPEED=true"

"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-compr\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,\
HDMI1_ID=4,HDMI2_ID=5,HDMI3_ID=6,COMPRESSED=true"

"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-compr-speed\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,\
HDMI1_ID=4,HDMI2_ID=5,HDMI3_ID=6,COMPRESSED=true,COMPRESSED_SPEED=true"

"cavs-sdw\;sof-ptl-rt721-compr\;PLATFORM=ptl,SDW_DMIC=1,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,COMPRESSED=true"
Expand Down
24 changes: 14 additions & 10 deletions tools/topology/topology2/include/components/phase_vocoder.conf
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ Class.Widget."phase_vocoder" {
shift 0
}
text.0 {
# Speeds over 1 are disabled for now to be able to operate
# Phase Vocoder Module without DP-DP bind need. The compress
# decoder must be DP, so the DP mode and more free PCM flow
# is not available for the Phase Vocoder.
name "phase_vocoder_speed_enum"
!values [
"0.5"
Expand All @@ -86,16 +90,16 @@ Class.Widget."phase_vocoder" {
"0.8"
"0.9"
"1.0"
"1.1"
"1.2"
"1.3"
"1.4"
"1.5"
"1.6"
"1.7"
"1.8"
"1.9"
"2.0"
#"1.1"
#"1.2"
#"1.3"
#"1.4"
#"1.5"
#"1.6"
#"1.7"
#"1.8"
#"1.9"
#"2.0"
]
}
ops.1 {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# Phase vocoder input formats: mono + stereo, all rates,
# 8/16/24/32-bit. ibs = frames * channels * bytes_per_sample
# (480 frames per DP period, matching current stereo values).
num_input_audio_formats 40
Comment on lines +1 to +4
CombineArrays.Object.Base.input_audio_format [
# mono
{
in_channels [ 1 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 8 ]
in_valid_bit_depth [ 8 ]
in_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ]
ibs [ 480 ]
}
{
in_channels [ 1 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 16 ]
in_valid_bit_depth [ 16 ]
ibs [ 960 ]
}
{
in_channels [ 1 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 32 ]
in_valid_bit_depth [ 24 ]
ibs [ 1920 ]
}
{
in_channels [ 1 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 32 ]
in_valid_bit_depth [ 32 ]
ibs [ 1920 ]
}
# stereo
{
in_channels [ 2 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 8 ]
in_valid_bit_depth [ 8 ]
in_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ]
ibs [ 960 ]
}
{
in_channels [ 2 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 16 ]
in_valid_bit_depth [ 16 ]
ibs [ 1920 ]
}
{
in_channels [ 2 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 32 ]
in_valid_bit_depth [ 24 ]
ibs [ 3840 ]
}
{
in_channels [ 2 ]
in_rate [
8000
44100
48000
96000
192000
]
in_bit_depth [ 32 ]
in_valid_bit_depth [ 32 ]
ibs [ 3840 ]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# Phase vocoder output formats: mono + stereo, all rates,
# 8/16/24/32-bit. obs = frames * channels * bytes_per_sample
# (240 frames per DP period, matching current stereo values).
num_output_audio_formats 40
CombineArrays.Object.Base.output_audio_format [
# mono
{
out_channels [ 1 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 8 ]
out_valid_bit_depth [ 8 ]
out_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ]
obs [ 240 ]
}
{
out_channels [ 1 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 16 ]
out_valid_bit_depth [ 16 ]
obs [ 480 ]
}
{
out_channels [ 1 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 32 ]
out_valid_bit_depth [ 24 ]
obs [ 960 ]
}
{
out_channels [ 1 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 32 ]
out_valid_bit_depth [ 32 ]
obs [ 960 ]
}
# stereo
{
out_channels [ 2 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 8 ]
out_valid_bit_depth [ 8 ]
out_sample_type [ $SAMPLE_TYPE_UNSIGNED_INTEGER ]
obs [ 480 ]
}
{
out_channels [ 2 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 16 ]
out_valid_bit_depth [ 16 ]
obs [ 960 ]
}
{
out_channels [ 2 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 32 ]
out_valid_bit_depth [ 24 ]
obs [ 1920 ]
}
{
out_channels [ 2 ]
out_rate [
8000
44100
48000
96000
192000
]
out_bit_depth [ 32 ]
out_valid_bit_depth [ 32 ]
obs [ 1920 ]
}
]
Loading
Loading