Skip to content

topology2: isolated dolby-dax widget setting on headphone #10642

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

Open
checkupup wants to merge 1 commit into
base: main
Choose a base branch
from
+291 −132
Open

topology2: isolated dolby-dax widget setting on headphone #10642

Show file tree
Hide file tree
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
129 changes: 96 additions & 33 deletions tools/topology/topology2/cavs-mixin-mixout-dax-ssp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

Define {
DOLBY_DAX_CORE_ID 0
DAX_HEADSET "false"
}

# Pipeline ID:1 PCM ID: 0
Expand Down Expand Up @@ -46,7 +47,9 @@ Object.Pipeline {
}
]

mixout-gain-dax-dai-copier-playback [
IncludeByKey.DAX_HEADSET {
"true" {
mixout-gain-dax-dai-copier-playback [
{
index $HEADSET_DAI_PIPELINE_ID

Expand Down Expand Up @@ -112,17 +115,20 @@ Object.Pipeline {
}
}
}
]
}
"false" {
mixout-gain-dai-copier-playback [
{
index $SPEAKER_DAI_PIPELINE_ID
core_id $SPEAKER_PCM_CORE_ID
index $HEADSET_DAI_PIPELINE_ID

Object.Widget.dai-copier.1 {
dai_index $SPEAKER_SSP_DAI_INDEX
dai_index $HEADSET_SSP_DAI_INDEX
dai_type "SSP"
copier_type "SSP"
stream_name "$SPEAKER_CODEC_NAME"
stream_name "$HEADSET_CODEC_NAME"
node_type $I2S_LINK_OUTPUT_CLASS
IncludeByKey.SSP_SPK_FMT_24 {
IncludeByKey.SSP_HS_FMT_24 {
"true" {
Object.Base.output_audio_format [
{
Expand All @@ -146,50 +152,107 @@ Object.Pipeline {

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Post Mixer $SPEAKER_PCM_NAME Playback Volume'
name 'Post Mixer $HEADSET_PCM_NAME Playback Volume'
}
}
}
]
}
}
mixout-gain-dax-dai-copier-playback [
{
index $SPEAKER_DAI_PIPELINE_ID
core_id $SPEAKER_PCM_CORE_ID

Object.Widget.dolby-dax.1 {
core_id $DOLBY_DAX_CORE_ID
Object.Control {
mixer."1" {
name 'DAX Speaker Switch'
}
mixer."2" {
name 'DAX Speaker Switch CP'
}
mixer."3" {
name 'DAX Speaker Switch CTC'
}
mixer."4" {
name 'DAX Speaker Volume'
}
enum."1" {
name 'DAX Speaker Profile'
Object.Widget.dai-copier.1 {
dai_index $SPEAKER_SSP_DAI_INDEX
dai_type "SSP"
copier_type "SSP"
stream_name "$SPEAKER_CODEC_NAME"
node_type $I2S_LINK_OUTPUT_CLASS
IncludeByKey.SSP_SPK_FMT_24 {
"true" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 24
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
}
enum."2" {
name 'DAX Speaker Device'
}
bytes."1" {
name 'DAX Speaker Tuning'
max 8192
]
}
"false" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
}
}

Object.Widget.pipeline.1 {
core $SPEAKER_PCM_CORE_ID
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Post Mixer $SPEAKER_PCM_NAME Playback Volume'
}
}

Object.Widget.dolby-dax.1 {
core_id $DOLBY_DAX_CORE_ID
Object.Control {
mixer."1" {
name 'DAX Speaker Switch'
}
mixer."2" {
name 'DAX Speaker Switch CP'
}
mixer."3" {
name 'DAX Speaker Switch CTC'
}
mixer."4" {
name 'DAX Speaker Volume'
}
enum."1" {
name 'DAX Speaker Profile'
}
enum."2" {
name 'DAX Speaker Device'
}
bytes."1" {
name 'DAX Speaker Tuning'
max 8192
}
}
}

Object.Widget.pipeline.1 {
core $SPEAKER_PCM_CORE_ID
}
}
]
}

Object.Base.route [
IncludeByKey.DAX_HEADSET {
"true" {
Object.Base.route [
{
source "dolby-dax.$HEADSET_DAI_PIPELINE_ID.1"
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
}
]
}
"false" {
Object.Base.route [
{
source "gain.$HEADSET_DAI_PIPELINE_ID.1"
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
}
]
}
}

Object.Base.route [
{
source "mixin.$HEADSET_HOST_PIPELINE_ID.1"
sink "mixout.$HEADSET_DAI_PIPELINE_ID.1"
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ Define {
SDW_AMP_XOVER_EQFIR_PARAMS default
DOLBY_DAX_CORE_ID 0
USE_DAX "false"
DAX_HEADSET "false"
SDW_ECHO_REF_DAI "false"
}

Expand Down
Loading
Loading