Skip to content

Commit 836e44e

Browse files
bardliaolgirdwood
authored andcommitted
topology2: sdw-jack-generic: always create module-copier.1.12
This is a preparation commit for creating a stand alone echo reference topology. module-copier.1.12 is used by the echo reference, but it is harmless to create it and connect it to the no echo reference topology. And then we can connect the echo reference pipeline to module-copier.1.12 is echo reference is needed. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 93a7f9d commit 836e44e

1 file changed

Lines changed: 39 additions & 63 deletions

File tree

tools/topology/topology2/platform/intel/sdw-jack-generic.conf

Lines changed: 39 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,28 @@ Object.Pipeline.host-gateway-capture [
514514

515515
# Jack capture pipeline widgets
516516
Object.Widget {
517+
module-copier."12" {
518+
index 1
519+
num_input_pins 1
520+
num_output_pins 2
521+
num_input_audio_formats 1
522+
num_output_audio_formats 1
523+
Object.Base.input_audio_format [
524+
{
525+
in_rate $JACK_RATE
526+
in_bit_depth 32
527+
in_valid_bit_depth 32
528+
}
529+
]
530+
Object.Base.output_audio_format [
531+
{
532+
out_rate $JACK_RATE
533+
out_bit_depth 32
534+
out_valid_bit_depth 32
535+
}
536+
]
537+
}
538+
517539
alh-copier [
518540
{
519541
stream_name $SDW_JACK_IN_STREAM
@@ -655,54 +677,30 @@ Object.PCM.pcm [
655677

656678
IncludeByKey.PASSTHROUGH {
657679
"false" {
658-
IncludeByKey.SDW_JACK_ECHO_REF {
680+
IncludeByKey.USE_DAX {
659681
"true" {
660-
IncludeByKey.USE_DAX {
661-
"true" {
662-
Object.Base.route [
663-
{
664-
source "dolby-dax.1.1"
665-
sink "module-copier.1.12"
666-
}
667-
{
668-
source "module-copier.1.12"
669-
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
670-
}
671-
]
682+
Object.Base.route [
683+
{
684+
source "dolby-dax.1.1"
685+
sink "module-copier.1.12"
672686
}
673-
"false" {
674-
Object.Base.route [
675-
{
676-
source "gain.1.1"
677-
sink "module-copier.1.12"
678-
}
679-
{
680-
source "module-copier.1.12"
681-
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
682-
}
683-
]
687+
{
688+
source "module-copier.1.12"
689+
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
684690
}
685-
}
691+
]
686692
}
687693
"false" {
688-
IncludeByKey.USE_DAX {
689-
"true" {
690-
Object.Base.route [
691-
{
692-
source "dolby-dax.1.1"
693-
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
694-
}
695-
]
694+
Object.Base.route [
695+
{
696+
source "gain.1.1"
697+
sink "module-copier.1.12"
696698
}
697-
"false" {
698-
Object.Base.route [
699-
{
700-
source "gain.1.1"
701-
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
702-
}
703-
]
699+
{
700+
source "module-copier.1.12"
701+
sink "alh-copier.$SDW_JACK_OUT_STREAM.0"
704702
}
705-
}
703+
]
706704
}
707705
}
708706

@@ -741,28 +739,6 @@ IncludeByKey.PASSTHROUGH {
741739

742740
IncludeByKey.SDW_JACK_ECHO_REF {
743741
"true" {
744-
Object.Widget.module-copier."12" {
745-
index 1
746-
num_input_pins 1
747-
num_output_pins 2
748-
num_input_audio_formats 1
749-
num_output_audio_formats 1
750-
Object.Base.input_audio_format [
751-
{
752-
in_rate $JACK_RATE
753-
in_bit_depth 32
754-
in_valid_bit_depth 32
755-
}
756-
]
757-
Object.Base.output_audio_format [
758-
{
759-
out_rate $JACK_RATE
760-
out_bit_depth 32
761-
out_valid_bit_depth 32
762-
}
763-
]
764-
}
765-
766742
Object.Pipeline {
767743
siggen-host-copier-capture [
768744
{

0 commit comments

Comments
 (0)