Tools: Topology2: Fix the gain.conf curve_type values

singalsu · kv2019i · commit 51159d80e4c3 · 2023-10-04T14:24:15.000+03:00
This patch adds the other SOF volume ramp types linear and
logarithmic with and without zero crossings detect mode to gain
widget class. The names of fade values are changed to be similar
as in enum sof_volume_ramp, since there is a specific curve
shape required for Windows OS.

Signed-off-by: Seppo Ingalsuo &lt;seppo.ingalsuo@linux.intel.com&gt;
diff --git a/tools/topology/topology2/include/components/gain.conf b/tools/topology/topology2/include/components/gain.conf
@@ -45,12 +45,20 @@ Class.Widget."gain" {
 		token_ref	"gain.word"
 		constraints {
 			!valid_values [
-				"no_fade"
-				"fade"
+				"windows_no_fade"
+				"windows_fade"
+				"linear"
+				"log"
+				"linear_zc"
+				"log_zc"
 			]
 			!tuple_values [
 				0
 				1
+				2
+				3
+				4
+				5
 			]
 		}
 	}
@@ -151,7 +159,7 @@ Class.Widget."gain" {
 	uuid 			"A8:A9:BC:61:D0:18:18:4A:8E:7B:26:39:21:98:04:B7"
 	no_pm			"true"
 	cpc 			10183
-	curve_type		"fade"
+	curve_type		"windows_fade"
 	curve_duration		200000		# 20 ms
 	init_value		0x7fffffff
 	num_input_pins		1

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,20 @@ Class.Widget."gain" {`
`45`	`45`	`token_ref "gain.word"`
`46`	`46`	`constraints {`
`47`	`47`	`!valid_values [`
`48`		`- "no_fade"`
`49`		`- "fade"`
	`48`	`+ "windows_no_fade"`
	`49`	`+ "windows_fade"`
	`50`	`+ "linear"`
	`51`	`+ "log"`
	`52`	`+ "linear_zc"`
	`53`	`+ "log_zc"`
`50`	`54`	`]`
`51`	`55`	`!tuple_values [`
`52`	`56`	`0`
`53`	`57`	`1`
	`58`	`+ 2`
	`59`	`+ 3`
	`60`	`+ 4`
	`61`	`+ 5`
`54`	`62`	`]`
`55`	`63`	`}`
`56`	`64`	`}`
`@@ -151,7 +159,7 @@ Class.Widget."gain" {`
`151`	`159`	`uuid "A8:A9:BC:61:D0:18:18:4A:8E:7B:26:39:21:98:04:B7"`
`152`	`160`	`no_pm "true"`
`153`	`161`	`cpc 10183`
`154`		`- curve_type "fade"`
	`162`	`+ curve_type "windows_fade"`
`155`	`163`	`curve_duration 200000 # 20 ms`
`156`	`164`	`init_value 0x7fffffff`
`157`	`165`	`num_input_pins 1`