Skip to content

Commit

Permalink
Tools: Topology2: Use windows_fade in nocodec topologies
Browse files Browse the repository at this point in the history
This patch changes all cavs-nocodec.conf based topologies to
use exponential Windows fade curve_type in gain components. It
is done to ensure the ramp gets tested after change of gain
curve_type default to linear.

The gain in included deep buffer playback pipeline (hw:0,31) and
in mixer pipeline (hw:0,41) are not changed because they are used
also in normal topologies. Also in capture direction DMIC raw
(hw:0,10) remains curve_type 2. Other gains are curve_type 1
Windows fade.

Signed-off-by: Seppo Ingalsuo <[email protected]>
  • Loading branch information
singalsu committed Oct 13, 2023
1 parent e524184 commit 49cd10c
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ IncludeByKey.PASSTHROUGH {
pcm_id 0
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Pre Mixer $SSP0_PCM_NAME Playback Volume'
}
Expand All @@ -204,6 +205,7 @@ IncludeByKey.PASSTHROUGH {
pcm_id 2
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
}
Expand All @@ -224,6 +226,7 @@ IncludeByKey.PASSTHROUGH {
}

Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Post Mixer $SSP0_PCM_NAME Playback Volume'
}
Expand Down Expand Up @@ -259,6 +262,7 @@ IncludeByKey.PASSTHROUGH {
}

Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Post Mixer $SSP2_PCM_NAME Playback Volume'
}
Expand All @@ -275,6 +279,7 @@ IncludeByKey.PASSTHROUGH {
pcm_id $SSP0_PCM_ID
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Post Demux $SSP0_PCM_NAME Capture Volume'
}
Expand All @@ -289,6 +294,7 @@ IncludeByKey.PASSTHROUGH {
pcm_id $SSP0_CAPTURE_PCM_ID
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Post Demux $SSP0_CAPTURE_PCM Volume'
}
Expand Down Expand Up @@ -329,6 +335,7 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_type "windows_fade"
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -394,6 +401,7 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Pre Demux $SSP0_PCM_NAME Capture Volume'
}
Expand Down Expand Up @@ -699,6 +707,7 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_type "windows_fade"
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -755,6 +764,7 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_type "windows_fade"
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -1101,6 +1111,7 @@ IncludeByKey.SSP1_ENABLED {
pcm_id 1
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Pre Mixer $SSP1_PCM_NAME Playback Volume'
}
Expand All @@ -1121,6 +1132,7 @@ IncludeByKey.SSP1_ENABLED {
}

Object.Widget.gain.1 {
curve_type "windows_fade"
Object.Control.mixer.1 {
name 'Post Mixer $SSP1_PCM_NAME Playback Volume'
}
Expand Down

0 comments on commit 49cd10c

Please sign in to comment.