From patchwork Wed Aug 31 18:32:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Matthews X-Patchwork-Id: 37579 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp517857pzh; Wed, 31 Aug 2022 11:32:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR6YQHCxxz17nOa4EIPeeHzofswrpDBbWrVlqvJr75rZ0gzzMmC/hfOyG7xqslY4Xghbq9MX X-Received: by 2002:a17:906:8251:b0:741:7a62:2376 with SMTP id f17-20020a170906825100b007417a622376mr11280904ejx.689.1661970747573; Wed, 31 Aug 2022 11:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661970747; cv=none; d=google.com; s=arc-20160816; b=arlHgtlbJKCxqeU76OkBken5PVYc+RJ6fqAqsWOjZ7Bhmq1nGuyCIkJAxqM8kzKggj 6fUWxIfz099vyaVLYdPYqLevLLzufJ3s8YAAmkszn4w9GQ1D0uJFwNnPdPVeuG2QLbae la89EsVE/rtTN1hAq/XxLVhEvlTx3xBH1VNwwF5sBC0E29qoP9qrX01Slk5PhxNxTfuK NIML4QpvuWPTwcWsvabR0YB03yI5Npl4zmN+AWG1aEnSwKxZbj8YTMYiLT6+MNd+uyhs DOSmM86NG3fVLxpCeZgkeYGLQ19/zS/24v5T6fKoSTrdbc1WD8/33NiJskPEBTUM4ips yVUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=I7DEbdq4/3RxzynLb6EcMXKjEr9PVHDPhD0NnD1/NKc=; b=lVdNC568hrc7op3cZ7fNVyJW0ftjHlE1HS+vY115PfZFtpYji/hXSMb6i8ZhfIZVrc cE9WApEKL+EIMC4zej4rbaPJkBb8i/yHI/2cvebvvCX+hagZBbVgwEcmMjLXc8qvifgE uVBgtH6pEu/f3ANYNDwW8O6YbTqEppFwszeLQAJIJ/7/2nNrpY8sdSu1p+W5EbmJHksa 6pdbEPXKkSSVLBndWaVhsDmqdwsPg4OFApZoElXeFBjIZVszUEveWyeOW2CJxQVlOpQ2 2T22ZPnWqCyNLnUIRXS9nG7LJrUFD3R8ZL44ia8+9znTDjnEXcTcM6kyBLx4uWJkbiZn Ea9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c2-20020a509f82000000b00447a7af56b2si11974695edf.326.2022.08.31.11.32.26; Wed, 31 Aug 2022 11:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97BD368BB2A; Wed, 31 Aug 2022 21:32:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 437A368B85A for ; Wed, 31 Aug 2022 21:32:17 +0300 (EEST) Received: by mail-qt1-f177.google.com with SMTP id g14so11661709qto.11 for ; Wed, 31 Aug 2022 11:32:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=d9cIaQ/OuqebxbrNQKYthH+/xcrWdK74wovgMvdb8Gg=; b=YNh7SiNH5nJ9HFJFqv9q79LAg/9E1DGt198KR//DoAKIHHcqwRkBC5aqnd2nGJgebR lAL156DjitKj4eWd+sykqOQtVb/1JyukvC6ENjGUM+KAtrxq0rncN5an5qXw5n4Ekxb8 BJAoVdyG+ZIlQBMtLVKI0/ZK56dBgenFXEAS1QtpAnvjIc0jhYLacO+//eGaexNjau7t JPYk9G6DQUYeFcD4BXCrTf4xl1n5enwGAZilBm9e6kIW/f2S+TDhwu+Cl7T1tBLH3DWi zbwx+McA1zAgILDwnDCWxPrE//cDmNc/y6hhyfCTOSdXHVkSdTW0WE5TAvydHZ7N2YsF HcNQ== X-Gm-Message-State: ACgBeo2+Gy9/6EhBg71X8srD1e7C1VNEeLNFLOiamgjwsin9Ur5w6eH6 s67FqEExPtJEZ0RRGgwiQtvABMo9woaoCg== X-Received: by 2002:ac8:5a14:0:b0:344:5660:6530 with SMTP id n20-20020ac85a14000000b0034456606530mr20302833qta.12.1661970735596; Wed, 31 Aug 2022 11:32:15 -0700 (PDT) Received: from localhost.localdomain ([107.159.99.23]) by smtp.gmail.com with ESMTPSA id v12-20020a05622a014c00b00341a807ed21sm9529861qtw.72.2022.08.31.11.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 11:32:15 -0700 (PDT) From: Tristan Matthews To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Aug 2022 14:32:07 -0400 Message-Id: <20220831183207.2703227-1-tmatth@videolan.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [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 Cc: Tristan Matthews Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fkCx7qG3k2D0 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++) {