Merge pull request #81 from tlauda/topic/volume_processing

volume: fix processing size in HiFi3 implementation

Author: plbossart

src/audio/volume_hifi3.c

@@ -60,7 +60,6 @@ static void vol_s16_to_s16(struct comp_dev *dev, struct comp_buffer *sink,
 	ae_f16x4 in_sample = AE_ZERO16();
 	size_t channel;
 	int i;
-	int limit = source->size / (dev->params.channels << 1);
 	ae_int16 *in = (ae_int16 *)source->r_ptr;
 	ae_int16 *out = (ae_int16 *)sink->w_ptr;
 
@@ -69,7 +68,7 @@ static void vol_s16_to_s16(struct comp_dev *dev, struct comp_buffer *sink,
 		vol_scaled[channel] = cd->volume[channel] * VOL_SCALE;
 
 	/* Main processing loop */
-	for (i = 0; i < limit; i++) {
+	for (i = 0; i < dev->frames; i++) {
 		/* Processing per channel */
 		for (channel = 0; channel < dev->params.channels; channel++) {
 			/* Load the input sample */
@@ -109,7 +108,6 @@ static void vol_s16_to_sX(struct comp_dev *dev, struct comp_buffer *sink,
 	size_t channel;
 	uint8_t shift_left = 0;
 	int i;
-	int limit = source->size / (dev->params.channels << 1);
 	ae_int16 *in = (ae_int16 *)source->r_ptr;
 	ae_int32 *out = (ae_int32 *)sink->w_ptr;
 
@@ -124,7 +122,7 @@ static void vol_s16_to_sX(struct comp_dev *dev, struct comp_buffer *sink,
 		vol_scaled[channel] = cd->volume[channel] * VOL_SCALE;
 
 	/* Main processing loop */
-	for (i = 0; i < limit; i++) {
+	for (i = 0; i < dev->frames; i++) {
 		/* Processing per channel */
 		for (channel = 0; channel < dev->params.channels; channel++) {
 			/* Load the input sample */
@@ -166,7 +164,6 @@ static void vol_sX_to_s16(struct comp_dev *dev, struct comp_buffer *sink,
 	size_t channel;
 	uint8_t shift_left = 0;
 	int i;
-	int limit = source->size / (dev->params.channels << 2);
 	ae_int32 *in = (ae_int32 *)source->r_ptr;
 	ae_int16 *out = (ae_int16 *)sink->w_ptr;
 
@@ -179,7 +176,7 @@ static void vol_sX_to_s16(struct comp_dev *dev, struct comp_buffer *sink,
 		vol_scaled[channel] = cd->volume[channel] * VOL_SCALE;
 
 	/* Main processing loop */
-	for (i = 0; i < limit; i++) {
+	for (i = 0; i < dev->frames; i++) {
 		/* Processing per channel */
 		for (channel = 0; channel < dev->params.channels; channel++) {
 			/* Load the input sample */
@@ -222,7 +219,6 @@ static void vol_s24_to_s24_s32(struct comp_dev *dev, struct comp_buffer *sink,
 	size_t channel;
 	uint8_t shift_left = 0;
 	int i;
-	int limit = source->size / (dev->params.channels << 2);
 	ae_int32 *in = (ae_int32 *)source->r_ptr;
 	ae_int32 *out = (ae_int32 *)sink->w_ptr;
 
@@ -235,7 +231,7 @@ static void vol_s24_to_s24_s32(struct comp_dev *dev, struct comp_buffer *sink,
 		vol_scaled[channel] = cd->volume[channel] * VOL_SCALE;
 
 	/* Main processing loop */
-	for (i = 0; i < limit; i++) {
+	for (i = 0; i < dev->frames; i++) {
 		/* Processing per channel */
 		for (channel = 0; channel < dev->params.channels; channel++) {
 			/* Load the input sample */
@@ -277,7 +273,6 @@ static void vol_s32_to_s24_s32(struct comp_dev *dev, struct comp_buffer *sink,
 	size_t channel;
 	uint8_t shift_right = 0;
 	int i;
-	int limit = source->size / (dev->params.channels << 2);
 	ae_int32 *in = (ae_int32 *)source->r_ptr;
 	ae_int32 *out = (ae_int32 *)sink->w_ptr;
 
@@ -290,7 +285,7 @@ static void vol_s32_to_s24_s32(struct comp_dev *dev, struct comp_buffer *sink,
 		vol_scaled[channel] = cd->volume[channel] * VOL_SCALE;
 
 	/* Main processing loop */
-	for (i = 0; i < limit; i++) {
+	for (i = 0; i < dev->frames; i++) {
 		/* Processing per channel */
 		for (channel = 0; channel < dev->params.channels; channel++) {
 			/* Load the input sample */