From patchwork Thu Sep 19 22:17:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15161 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 646034483B9 for ; Fri, 20 Sep 2019 01:24:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50F0F689E42; Fri, 20 Sep 2019 01:24:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09303689E50 for ; Fri, 20 Sep 2019 01:24:35 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id v17so131231wml.4 for ; Thu, 19 Sep 2019 15:24:35 -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=E50Lcvz/bG4dd5VjZgaJyu2M4qPaqp3vGDN3uasDya4=; b=KiQKM4Wo1hMBErEs9dcNxBoSh1ug+A9UBVbmFEgh44ZDEDwDI+mW8bRnr3WpmU7e9C kjQ/p8eqmpsdosyPNRZq4DIcFZHVzPx08OQ3IJKV3XuOwSu+xjaDDGH36M5nI1h7k1uz utrFngOoR2lIOLSf69Lzg5prtP4saDIC5paDrch2/7BghCjoPTSxbpeGVKK9Z5Sx4khx CXeedJsgOyLKWU/puE6c5Ux6HCVczlJ6T6CAjkNCiDGpk1/bpWuznQk1Vs4RiSVIke+y U6AXn9p5D5jnBUkM4M3DgRBf3b3bUbbT5PaRg1bbWH7Fl2/pYG42nifU0RKHjWhquLqX pEAg== 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=E50Lcvz/bG4dd5VjZgaJyu2M4qPaqp3vGDN3uasDya4=; b=sd6ZWG8XvHDn/n4tfaRgnYIY+9L33H9wMrexeHpvSgISzVbkqWDW7rqrzBxkueRtWg qU/MZE4yUI4phnc8mZ5BdhrLgogLzG0aYlVF6lrqQKlf6JholqRkwPcjZDOLKutCzOAw 9nrAq8xzuDr6PDePMiBy0oBS9wNhE9RbllmsA/WVYn5HAG3DV9tM/a8ybY/ya6GORfEp /vecNdOKa+6/2w+G7gggqEaAikapzeAxUs9FHdnZFZ+4wwVMIbAVdDtHHpuRLz1d/mWj 4vZKJEWaX9RQT+4cmwkEwkEM70q0EdedT3qdXGRa5QmtJT/KOJ8eqg/w6syJd8cI15XS TfwQ== X-Gm-Message-State: APjAAAXrSOxMflQcqKm6hEuQFaUVmfWEmEs7jGgfhtXSxQ/8tvJMdlVg dzaGNXokTlHKUpHDdbTI0TRh63tI X-Google-Smtp-Source: APXvYqyagd7noLOFBhu8PQsWy7zwa6lKMs6Ych+XGFKp7mPLztB3e2szFCjAOFi0sijW8ByumwoACg== X-Received: by 2002:a7b:c108:: with SMTP id w8mr136028wmi.8.1568931873932; Thu, 19 Sep 2019 15:24:33 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 15:24:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Sep 2019 00:17:06 +0200 Message-Id: <20190919221706.16529-12-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 11/11] avcodec/ac3enc: Fix invalid shift 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 FATE-tests unknown_layout-ac3, ac3-fixed-encode, ac3-encode and eac3-encode. It furthermore fixes the ac3-encoder bugs mentioned in tickets #7994, #8144 and #8159. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index f1c95ce877..76872a8fe0 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1065,7 +1065,7 @@ static int bit_alloc(AC3EncodeContext *s, int snr_offset) { int blk, ch; - snr_offset = (snr_offset - 240) << 2; + snr_offset = (snr_offset - 240) * 4; reset_block_bap(s); for (blk = 0; blk < s->num_blocks; blk++) {