From patchwork Sat May 2 08:14:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 19425 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 51A1B44A747 for ; Sat, 2 May 2020 11:14:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D15968C38E; Sat, 2 May 2020 11:14:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F13D268C389 for ; Sat, 2 May 2020 11:14:20 +0300 (EEST) Received: by mail-il1-f181.google.com with SMTP id w6so6513525ilg.1 for ; Sat, 02 May 2020 01:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=nXc2MreDh55NYoe0+K/t224rDXltSWsIVxwFQdI5g2c=; b=e+6mQrhK37Ywt1knmLg13s/bfYlgiUauqunfS2Ib3m/YlzTOqGHK1OTUG0WXPvNDp9 CUb6ufe0VbdeOnYAhQp/BMF95QwJdJ1xTYwuF6mqebqetLuaF47nwoYQy4KjMUgkQVom s2obtaobJPN5Zzq7VIMol9tnHKbAj5Oa0/1jhvuKnKyGhH0cnc3AlOif4N+1Ow3tnCX0 k47JTRTGmV0l1vwrwPzfbrSPwviukxm7rJy4sskVZJk3yUpSDRIFuKkpY2ySM/PLTCgA +FKnA7S/5S7tibcXD7Aknmx1zqXVGl90WWODzG+r9j0EEjiZsm3KsW2DXNzSnnAkiwqy /d4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=nXc2MreDh55NYoe0+K/t224rDXltSWsIVxwFQdI5g2c=; b=e3MiqYD5LsreJ87/Bs43Y9oV6NB4Bcv+VxIuPr/WHd6OusJiRZ8HQEYTpRBxmwKztX f7I07c4AkE7aI7N2IMZ+zkYYgaswFKt6Vehx5sRLsvMJDuApd+baZBl3uIJoWaBfYZKo 18+M5l6OVWk35znboXcEcGhFbndZzQRWtWhcBC2ESKIipYPJTmHnW587k8++6CclFWkb f2eTHK5dejtPhxsEx0sVxw+6a/+KQqs0ydllBs04WIDQp7p0VUJwao8X0UTOgAQAS9hA EGeE3hPPzU7hD8jYj9s2c9lFExmTcS3WrYH7L5V9q6o4q4WNpX63CgKypbs7gihCeNsH KNIA== X-Gm-Message-State: AGi0PuYJwTXeAI/3auFIVJdyZBgL23e9A0Js5M2Q7GG8G+vVvF6aypoA 633gOMj+Q3MHK+P2PK1muff68BkpXV8sCaLach793uur X-Google-Smtp-Source: APiQypLyidlypz6rdM0RTA0FhtUMPz8IljSYo8ZNzm84hSY0c7/webmADomtXeWGEouizGDyKS3Yo9Jgb7zkmAtsRm8= X-Received: by 2002:a92:8f13:: with SMTP id j19mr7303642ild.54.1588407259001; Sat, 02 May 2020 01:14:19 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sat, 2 May 2020 10:14:07 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/opus: Reset alloc_trim when doing decoder bit-allocation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! I believe attached patch fixes ticket #8649, a regression reported yesterday on irc, I don't see anymore (and forgot) the irc name of the original reporter, that's why it is missing in the ticket and the patch. Improvements for the commit message welcome. Please comment, Carl Eugen From b16b0ad02510259fe3ce536144eb8ddec4f65f7b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 2 May 2020 10:09:01 +0200 Subject: [PATCH] lavc/opus: Reset alloc_trim when doing decoder bit-allocation. Fixes ticket #8649. --- libavcodec/opus.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index f74278a7e3..0e599783c3 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -613,6 +613,8 @@ void ff_celt_bitalloc(CeltFrame *f, OpusRangeCoder *rc, int encode) } /* Allocation trim */ + if (!encode) + f->alloc_trim = 5; if (opus_rc_tell_frac(rc) + (6 << 3) <= tbits_8ths) if (encode) ff_opus_rc_enc_cdf(rc, f->alloc_trim, ff_celt_model_alloc_trim); -- 2.24.1