Skip to content

Commit

Permalink
Tools: Topology2: Remove 50 ms curve duration set from nocodec
Browse files Browse the repository at this point in the history
We need to care about audio user experience and peak MCPS
usage in production topologies.

The alsabat test is disturbed by the longer ramp so the
change can be reverted from nocodec topologies. Those
topologies are never used by end users. Also the peak MCPS
mitigation is not relevant for test topologies, as long as
higher MCPS is not triggering error reports. The curve
duration is restored without explicit set to the default 20 ms.

Fixes: thesofproject#8238
Fixes: d0d74a4
       ("Tools: Topology2: Change in capture gain
       curve_duration to 50 m")

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
  • Loading branch information
singalsu authored and lgirdwood committed Sep 25, 2023
1 parent beddfb3 commit 2cdd11a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions tools/topology/topology2/cavs-nocodec-multicore.conf
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -397,7 +396,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -456,7 +454,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down
6 changes: 0 additions & 6 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ IncludeByKey.PASSTHROUGH {
pcm_id $SSP0_PCM_ID
}
Object.Widget.gain.1 {
curve_duration 500000
Object.Control.mixer.1 {
name 'Post Demux $SSP0_PCM_NAME Capture Volume'
}
Expand All @@ -290,7 +289,6 @@ IncludeByKey.PASSTHROUGH {
pcm_id $SSP0_CAPTURE_PCM_ID
}
Object.Widget.gain.1 {
curve_duration 500000
Object.Control.mixer.1 {
name 'Post Demux $SSP0_CAPTURE_PCM Volume'
}
Expand Down Expand Up @@ -331,7 +329,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -397,7 +394,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
Object.Control.mixer.1 {
name 'Pre Demux $SSP0_PCM_NAME Capture Volume'
}
Expand Down Expand Up @@ -703,7 +699,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down Expand Up @@ -760,7 +755,6 @@ IncludeByKey.PASSTHROUGH {
}
}
Object.Widget.gain.1 {
curve_duration 500000
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.audio_format.1 {
Expand Down

0 comments on commit 2cdd11a

Please sign in to comment.