From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1938743E8C for ; Thu, 15 Sep 2022 18:00:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36EF368BBCE; Thu, 15 Sep 2022 21:00:03 +0300 (EEST) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4508268BBBC for ; Thu, 15 Sep 2022 20:59:57 +0300 (EEST) Received: by mail-qt1-f177.google.com with SMTP id a20so11562446qtw.10 for ; Thu, 15 Sep 2022 10:59:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date; bh=iyijPy/R/bH97R3OwonO+rnco1NovAmi4gKgXb2RVtY=; b=3i4cAvOxQjZOxataxOjoLUSau7IIyqeftDECIboXjLQ3ralYyRTNZCQY3EKYhYQaV8 5qKl15d3DQiN4+0TYpQ4T2Ry7O+bNkEqi2ndvwRrh/4gQ0jTn9W7USem4x0bhBH0E9gC uCcm6LbGahQK2V2qIbjVmpouw3PjHHemRpoCV1bjN6beWILN3pByO1tSMvryf93NIBP/ aKrzDKSnxohwFQTSX/5DEOnnRZRaY9NjqnHxP/q8iFC5clLM6oM3MWOdkhJozrzcVVj9 Teo0OH/FtDnFvU0DG6tB2K1aHVjhFOTBeNOvbJZyxvYOgLejYDME6sTBvWzjlCoUN0zQ 2Ncg== X-Gm-Message-State: ACrzQf0XMN2rX24Hs2v0euNf96pHT198SUiNawOXyUT0rShrLc08N0VK 5Nh9YAOcqb7AtRy7xOL0dGBEswpSs8D1Zw== X-Google-Smtp-Source: AMsMyM7fTWllFElv+5PWujFQt8HICSozdzUpeuwUCvE3OwumSdj2FzAaWQpjX2d5+7UDCdluZtd4xA== X-Received: by 2002:a05:622a:3cd:b0:344:9749:8228 with SMTP id k13-20020a05622a03cd00b0034497498228mr1034925qtx.512.1663264795221; Thu, 15 Sep 2022 10:59:55 -0700 (PDT) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com. [209.85.128.181]) by smtp.gmail.com with ESMTPSA id f11-20020a05620a280b00b006af3f3b385csm4922351qkp.98.2022.09.15.10.59.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Sep 2022 10:59:54 -0700 (PDT) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-3454e58fe53so230339737b3.2 for ; Thu, 15 Sep 2022 10:59:54 -0700 (PDT) X-Received: by 2002:a81:a185:0:b0:345:1dd4:f4e4 with SMTP id y127-20020a81a185000000b003451dd4f4e4mr864834ywg.497.1663264794437; Thu, 15 Sep 2022 10:59:54 -0700 (PDT) MIME-Version: 1.0 References: <20220831183207.2703227-1-tmatth@videolan.org> In-Reply-To: <20220831183207.2703227-1-tmatth@videolan.org> From: Tristan Matthews Date: Thu, 15 Sep 2022 13:59:43 -0400 X-Gmail-Original-Message-ID: Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Wed, Aug 31, 2022 at 2:32 PM Tristan Matthews wrote: > > Fix suggested by Mark Harris. Fixes ticket #9890 > --- > libavcodec/opus_silk.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c > index 8523b55ada..0b4438388e 100644 > --- a/libavcodec/opus_silk.c > +++ b/libavcodec/opus_silk.c > @@ -828,11 +828,16 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, > > /* decode the LBRR frames */ > for (i = 0; i < nb_frames; i++) { > + int skipped = 0; > for (j = 0; j < coded_channels; j++) > if (redundancy[j] & (1 << i)) { > int active1 = (j == 0 && !(redundancy[1] & (1 << i))) ? 0 : 1; > silk_decode_frame(s, rc, i, j, coded_channels, 1, active1, 1); > + skipped = 1; > } > + /* reset midonly if needed */ > + if (skipped) > + s->midonly = 0; > } > > for (i = 0; i < nb_frames; i++) { > -- > 2.34.1 > Ping _______________________________________________ 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".