From patchwork Mon Jan 20 15:56:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17438 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 45A98449D81 for ; Mon, 20 Jan 2020 18:12:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A2C068AD08; Mon, 20 Jan 2020 18:12:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2901C6880FD for ; Mon, 20 Jan 2020 18:12:19 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id t14so134859wmi.5 for ; Mon, 20 Jan 2020 08:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W0dbTxTq86ybZsF5Fj086wlC54pCKbCJjImLDtlbZfk=; b=tcKjPesO4/gPehTz+1eIcT1tnQVMy7XXSo9ZamKlfJ6jTE5OeMZZl+Xfzq5sHITwdU 3GErM5NW6SvtClX/QHdKCJbfsyJhyE/KtetBsqwGEq+nT/zkwQYWGat4V3OGzaGFyzVy z+YAIXjHwA33SbT8buYTJhk5NYVkOEbSpvLuHSRrHKLzoEFT1rxDSeqyVdlinDNf3DNU Ug/PKw9pn9jP0+NxL4QyxIlpkNNImg+rAhemgC2taSqt+E2MjBaNk/fFvmb+LeRyp6k/ nKltHFk9ngzqrVrIzjrLd9qRSkxIg7whyL5Z+UJZpyqM8CrbFOMrIlQpiXisLKgJIIBd 83VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W0dbTxTq86ybZsF5Fj086wlC54pCKbCJjImLDtlbZfk=; b=TaChNcuhMRL3xkRjIk2m1eRDVnFbGZajGa40toxAFM7i4pMtM2RQHLRgSit3w1s5LM p4+iBBnwJF7MWT6CgD3uQr84r+bFf8WBUAUlp0jCvzB9nlIcUvXDodIUTzWHD6BEA28K FDk9O+uCX/gzWbsgbOBtKjviNNMr2EUASscsqkfmzfbOf3P6p7PuZ19HG6SP8UrrEdJc YCWWqgqBUAqgOII2AR2dR2k6mjTn4TftaFv0V+leJEqqo0FPXfpG7CRQ7vRo5yWUpuhk IAAe81xzODRCsaTG7mluOqH0pjkfD9BHx4H+ET3wSbi7UWtszc43NrWm2D6AXc01BdUC s3+Q== X-Gm-Message-State: APjAAAUEFtMVzF1C6GYhlC0HPblu3oAD3ckVjWgNxOO1o0/F4h/xAxZX ZQUvbBxe04K8EbPyVMnG25BXa0jk X-Google-Smtp-Source: APXvYqwYMbU7sLD8+Oh8iAPZR3AvRBb5rQ9i3f6YL6536nkCSOx6ISOYFf38GF/B/nv7q/alkWfs3g== X-Received: by 2002:a05:600c:141:: with SMTP id w1mr79678wmm.61.1579536738372; Mon, 20 Jan 2020 08:12:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id 4sm22179535wmg.22.2020.01.20.08.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 08:12:17 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Jan 2020 16:56:55 +0100 Message-Id: <20200120155655.19734-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avcodec/adpcm: Fix undefined left shifts of negative numbers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Affected the adpcm-afc, adpcm-ea-1, adpcm-ea-2, adpcm-ea-maxis-xa, adpcm-thp and ea-cdata FATE-tests. Also fixes ticket #8487. Signed-off-by: Andreas Rheinhardt --- libavcodec/adpcm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 7b5b3d9698..ed16438e33 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1282,8 +1282,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (count2 = 0; count2 < 28; count2++) { byte = bytestream2_get_byteu(&gb); - next_left_sample = sign_extend(byte >> 4, 4) << shift_left; - next_right_sample = sign_extend(byte, 4) << shift_right; + 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) + @@ -1322,7 +1322,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, if (st) byte[1] = bytestream2_get_byteu(&gb); for(i = 4; i >= 0; i-=4) { /* Pairwise samples LL RR (st) or LL LL (mono) */ for(channel = 0; channel < avctx->channels; channel++) { - int sample = sign_extend(byte[channel] >> i, 4) << shift[channel]; + int sample = sign_extend(byte[channel] >> i, 4) * (1 << shift[channel]); sample = (sample + c->status[channel].sample1 * coeff[channel][0] + c->status[channel].sample2 * coeff[channel][1] + 0x80) >> 8; @@ -1437,11 +1437,11 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int level, pred; int byte = bytestream2_get_byteu(&gb); - level = sign_extend(byte >> 4, 4) << shift[n]; + level = sign_extend(byte >> 4, 4) * (1 << shift[n]); pred = s[-1] * coeff[0][n] + s[-2] * coeff[1][n]; s[0] = av_clip_int16((level + pred + 0x80) >> 8); - level = sign_extend(byte, 4) << shift[n]; + level = sign_extend(byte, 4) * (1 << shift[n]); pred = s[0] * coeff[0][n] + s[-1] * coeff[1][n]; s[1] = av_clip_int16((level + pred + 0x80) >> 8); } @@ -1598,8 +1598,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, sampledat = sign_extend(byte >> 4, 4); } - sampledat = ((prev1 * factor1 + prev2 * factor2) + - ((sampledat * scale) << 11)) >> 11; + sampledat = ((prev1 * factor1 + prev2 * factor2) >> 11) + + sampledat * scale; *samples = av_clip_int16(sampledat); prev2 = prev1; prev1 = *samples++; @@ -1676,7 +1676,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } sampledat = ((c->status[ch].sample1 * factor1 - + c->status[ch].sample2 * factor2) >> 11) + (sampledat << exp); + + c->status[ch].sample2 * factor2) >> 11) + sampledat * (1 << exp); *samples = av_clip_int16(sampledat); c->status[ch].sample2 = c->status[ch].sample1; c->status[ch].sample1 = *samples++;