From patchwork Thu Sep 19 22:17:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15158 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 356104483B9 for ; Fri, 20 Sep 2019 01:24:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 183BF689DCF; Fri, 20 Sep 2019 01:24:36 +0300 (EEST) 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 27926689D6F for ; Fri, 20 Sep 2019 01:24:30 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id i16so140917wmd.3 for ; Thu, 19 Sep 2019 15:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2xJINAXIdJnv1jw+Nrsb/hxIFIXK0iZN17KSYLuOUl4=; b=fHcsC2lqAJOU39iQFjEsQVGR319KZzpb0wcl5KKCIN5E5TKIJKCznZ5V5C6Yz+qYU5 2BxCddsVfm3wgeC3/fhIcWiwIN49qAkM4Lrly+FicxFH14jUaJnMrFSWUS9uPtShs9y4 S1NEoXVXcegtyuaWsGwReSc+q+8OrxtvTNFpTRhYLmmZ1y076pr+rxzaV96UWO32Uem/ QC+aZY0M2FGqshJjvxqEbDdt2uxojvkrFa2XvUXyjIG9mC45x+RtLLceZLWSj9mfIawC iF+/w04ifneNyf2DuweEYUSBSu/us3WewXfg8pzt7ED3vD9uy69kI5NbK+o1XzfREZeU 4y1A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2xJINAXIdJnv1jw+Nrsb/hxIFIXK0iZN17KSYLuOUl4=; b=ehyE5JFFcwueB7sAe05fAEoD5oSi6IUSsB6pscwmqHQ9NWlcnVRBtD3WP/6k6XXCXK +G36P+XBojafzfRfe1VXZnCrOaLfmXZLuNklIL5hXKgVjoDBS3U7DQoPnOvoWBHVEOyn nSgEnvFH+ychM0epnaHfBjGlNS/LB2znB3Fd1Wm9Wh5Ga7jIGdoLH+E1rjMbM/OikDzg Fta/naAh2wxHEIfGfVDyXCw5cSxZDgTvNdVIKhlykcGEr48vO9VRKYSVg/HKZFuceYv/ P/0FIFkCarjVArhV/iKJxUQ0MFh2eTjI4Fu3rjR2Pair3VOvTuiKc6tKYn43KGiEReFw ze6Q== X-Gm-Message-State: APjAAAWocziiN/afetLq/34814ELlHI5Gf1dk3XMUbY5DIg3EYOimkEX 0E8qdEPtSZ0X2upZKmZ4hMNstkDe X-Google-Smtp-Source: APXvYqxu2qAJNSctc3MuSNBB+HVlyw9qohczXhzjmeSnrSLQNvRuLbtAg3rKb+VfYrbBjCnuM67B8g== X-Received: by 2002:a1c:d188:: with SMTP id i130mr104752wmg.101.1568931869462; Thu, 19 Sep 2019 15:24:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id y12sm49955wrn.74.2019.09.19.15.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 15:24:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Sep 2019 00:17:01 +0200 Message-Id: <20190919221706.16529-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190919221706.16529-1-andreas.rheinhardt@gmail.com> References: <20190919221706.16529-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/pcm: Fix undefined shifts 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" Fixes the acodec-pcm-u16[lb]e FATE-tests. Signed-off-by: Andreas Rheinhardt --- Changing the macro for planar decoding is actually unnecessary, as none of the currently used users of this macro need it. I have nevertheless done so to minimise the changes between the macros. libavcodec/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index ffcbccc77d..d9176732d9 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -303,7 +303,7 @@ static av_cold int pcm_decode_close(AVCodecContext *avctx) #define DECODE(size, endian, src, dst, n, shift, offset) \ for (; n > 0; n--) { \ uint ## size ## _t v = bytestream_get_ ## endian(&src); \ - AV_WN ## size ## A(dst, (v - offset) << shift); \ + AV_WN ## size ## A(dst, (uint ## size ## _t)(v - offset) << shift); \ dst += size / 8; \ } @@ -314,7 +314,7 @@ static av_cold int pcm_decode_close(AVCodecContext *avctx) dst = frame->extended_data[c]; \ for (i = n; i > 0; i--) { \ uint ## size ## _t v = bytestream_get_ ## endian(&src); \ - AV_WN ## size ## A(dst, (v - offset) << shift); \ + AV_WN ## size ## A(dst, (uint ## size ##_t)(v - offset) << shift); \ dst += size / 8; \ } \ }