[FFmpeg-devel] [PATCH] avcodec/adpcm: only process right samples when decoding stereo

[FFmpeg-devel] [PATCH] avcodec/adpcm: only process right samples when decoding stereo

[Peter Ross]

[-- Attachment #1.1: Type: text/plain, Size: 2097 bytes --]

Fixes Coverity issue #1610760.
---
 libavcodec/adpcm.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index afdbeaa15e..58f2ef0dfb 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1684,22 +1684,24 @@ static int adpcm_decode_frame(AVCodecContext *avctx, AVFrame *frame,
             for (int count2 = 0; count2 < (channels == 2 ? 28 : 14); count2++) {
                 byte = bytestream2_get_byteu(&gb);
                 next_left_sample  = sign_extend(byte >> 4, 4) * (1 << shift_left);
-                next_right_sample = sign_extend(byte,      4) * (1 << shift_right);
 
                 next_left_sample = (next_left_sample +
                     (current_left_sample * coeff1l) +
                     (previous_left_sample * coeff2l) + 0x80) >> 8;
-                next_right_sample = (next_right_sample +
-                    (current_right_sample * coeff1r) +
-                    (previous_right_sample * coeff2r) + 0x80) >> 8;
 
                 previous_left_sample = current_left_sample;
                 current_left_sample = av_clip_int16(next_left_sample);
-                previous_right_sample = current_right_sample;
-                current_right_sample = av_clip_int16(next_right_sample);
                 *samples++ = current_left_sample;
 
                 if (channels == 2){
+                    next_right_sample = sign_extend(byte, 4) * (1 << shift_right);
+
+                    next_right_sample = (next_right_sample +
+                        (current_right_sample * coeff1r) +
+                        (previous_right_sample * coeff2r) + 0x80) >> 8;
+
+                    previous_right_sample = current_right_sample;
+                    current_right_sample = av_clip_int16(next_right_sample);
                     *samples++ = current_right_sample;
                 } else {
                     next_left_sample  = sign_extend(byte, 4) * (1 << shift_left);
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".