Merge pull request #555 from singalsu/fix_vol_mult_s24_to_s16

lgirdwood · web-flow · commit 2f7b57551a06 · 2018-11-09T08:40:14.000Z
Volume: Bug fix for vol_mult_s24_to_s16() function
diff --git a/src/audio/volume_generic.c b/src/audio/volume_generic.c
@@ -50,7 +50,7 @@
  *
  * Volume multiply for 24 bit input and 16 bit bit output.
  */
-static inline int16_t vol_mult_s24_to_s16(int16_t x, int32_t vol)
+static inline int16_t vol_mult_s24_to_s16(int32_t x, int32_t vol)
 {
 	return (int16_t)q_multsr_sat_32x32_16(sign_extend_s24(x), vol,
 					      Q_SHIFT_BITS_64(23, 16, 15));

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`*`
`51`	`51`	`* Volume multiply for 24 bit input and 16 bit bit output.`
`52`	`52`	`*/`
`53`		`-static inline int16_t vol_mult_s24_to_s16(int16_t x, int32_t vol)`
	`53`	`+static inline int16_t vol_mult_s24_to_s16(int32_t x, int32_t vol)`
`54`	`54`	`{`
`55`	`55`	`return (int16_t)q_multsr_sat_32x32_16(sign_extend_s24(x), vol,`
`56`	`56`	`Q_SHIFT_BITS_64(23, 16, 15));`