Skip to content

Revert "Tools: Topology2: Add IIR, FIR, DRC to HDA analog playback" #8962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fredoh9 wants to merge 1 commit into from
Closed

Revert "Tools: Topology2: Add IIR, FIR, DRC to HDA analog playback" #8962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 2 additions & 25 deletions tools/topology/topology2/cavs-mixin-mixout-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ Define {
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
DEEP_BUFFER_PIPELINE_SINK 'mixout.2.1'
DEEP_BUFFER_PCM_NAME 'Deepbuffer HDA Analog'
EFX_FIR_PARAMS 'passthrough'
Copy link
Collaborator

@singalsu singalsu Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another fix

Copy link
Collaborator

@singalsu singalsu Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #8963

EFX_IIR_PARAMS 'passthrough'
EFX_DRC_PARAMS 'passthrough'
}

# include deep buffer config if buffer size is in 1 - 1000 ms.
Expand All @@ -31,7 +28,7 @@ Object.Dai.HDA [
]

Object.Pipeline {
mixout-gain-efx-dai-copier-playback [
mixout-gain-dai-copier-playback [
{
index 2

Expand All @@ -46,26 +43,6 @@ Object.Pipeline {
name 'Post Mixer $ANALOG_PLAYBACK_PCM Volume'
}
}
Object.Widget.eqiir.1 {
Object.Control.bytes."1" {
name 'Post Mixer $ANALOG_PLAYBACK_PCM IIR Eq bytes'
}
}
Object.Widget.eqfir.1 {
Object.Control.bytes."1" {
name 'Post Mixer $ANALOG_PLAYBACK_PCM FIR Eq bytes'
}
}
Object.Widget.drc.1 {
Object.Control {
bytes."1" {
name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC bytes'
}
mixer."1" {
name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC switch'
}
}
}
}
]

Expand Down Expand Up @@ -156,7 +133,7 @@ Object.PCM.pcm [
Object.Base.route [
{
sink 'dai-copier.HDA.$HDA_ANALOG_DAI_NAME.playback'
source 'drc.2.1'
source 'gain.2.1'
}
{
source 'mixin.1.1'
Expand Down