diff --git a/tools/topology/topology2/include/bench/asrc_s16.conf b/tools/topology/topology2/include/bench/asrc_s16.conf index 82647eea960f..eb56e132c2a2 100644 --- a/tools/topology/topology2/include/bench/asrc_s16.conf +++ b/tools/topology/topology2/include/bench/asrc_s16.conf @@ -1,16 +1,14 @@ # Created with script "./bench_comp_generate.sh asrc" Object.Widget.asrc.1 { - index 1 - asynchronous_mode 0 - operation_mode 0 - rate_out 48000 + index 1 + operation_mode 0 + rate_out 48000 } Object.Widget.asrc.2 { - index 3 - rate_in 48000 - asynchronous_mode 0 - operation_mode 1 + index 3 + operation_mode 1 + rate_out 0 } diff --git a/tools/topology/topology2/include/bench/asrc_s24.conf b/tools/topology/topology2/include/bench/asrc_s24.conf index 4121e4aa7447..cec26b12a547 100644 --- a/tools/topology/topology2/include/bench/asrc_s24.conf +++ b/tools/topology/topology2/include/bench/asrc_s24.conf @@ -1,16 +1,14 @@ # Created with script "./bench_comp_generate.sh asrc" Object.Widget.asrc.1 { - index 1 - asynchronous_mode 0 - operation_mode 0 - rate_out 48000 + index 1 + operation_mode 0 + rate_out 48000 } Object.Widget.asrc.2 { - index 3 - asynchronous_mode 0 - operation_mode 1 - rate_in 48000 + index 3 + operation_mode 1 + rate_out 0 } diff --git a/tools/topology/topology2/include/bench/asrc_s32.conf b/tools/topology/topology2/include/bench/asrc_s32.conf index 2de2edaa08b5..5d076cb05c7f 100644 --- a/tools/topology/topology2/include/bench/asrc_s32.conf +++ b/tools/topology/topology2/include/bench/asrc_s32.conf @@ -1,16 +1,14 @@ # Created with script "./bench_comp_generate.sh asrc" Object.Widget.asrc.1 { - index 1 - asynchronous_mode 0 - operation_mode 0 - rate_out 48000 + index 1 + operation_mode 0 + rate_out 48000 } Object.Widget.asrc.2 { - index 3 - asynchronous_mode 0 - operation_mode 1 - rate_in 48000 + index 3 + operation_mode 1 + rate_out 0 } diff --git a/tools/topology/topology2/include/common/tokens.conf b/tools/topology/topology2/include/common/tokens.conf index dadfc162483c..46b172bb08e2 100644 --- a/tools/topology/topology2/include/common/tokens.conf +++ b/tools/topology/topology2/include/common/tokens.conf @@ -63,9 +63,7 @@ Object.Base.VendorToken { "7" { name "asrc" - rate_in 320 - rate_out 321 - asynchronous_mode 322 + rate_out 321 operation_mode 323 } diff --git a/tools/topology/topology2/include/components/asrc.conf b/tools/topology/topology2/include/components/asrc.conf index 1adcb9b457de..5ea82b0e7882 100644 --- a/tools/topology/topology2/include/components/asrc.conf +++ b/tools/topology/topology2/include/components/asrc.conf @@ -8,7 +8,6 @@ # Object.Widget.asrc."N" { # format "s24le" # rate_out 48000 -# asynchronous_mode 1 # operation_mode 0 # } # @@ -32,24 +31,12 @@ Class.Widget."asrc" { # Bespoke attributes for ASRC # - # Source sample rate - DefineAttribute."rate_in" { - # Token set reference name and type - token_ref "asrc.word" - - } - # Target sample rate DefineAttribute."rate_out" { # Token set reference name and type token_ref "asrc.word" } - DefineAttribute."asynchronous_mode" { - # Token set reference name and type - token_ref "asrc.word" - } - DefineAttribute."operation_mode" { # Token set reference name and type token_ref "asrc.word" @@ -66,7 +53,6 @@ Class.Widget."asrc" { ] !mandatory [ - "asynchronous_mode" "operation_mode" "num_input_audio_formats" "num_output_audio_formats"