From patchwork Fri Sep 23 11:43:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Matthews X-Patchwork-Id: 38194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp384003pzh; Fri, 23 Sep 2022 04:44:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bghJFSpTuZlbPWxKDsn4SGNG7hSK5uD/CQRPuac2HlyEH32F16GcPUHp+oioSDZILeg8l X-Received: by 2002:a05:6402:2201:b0:44f:443e:2a78 with SMTP id cq1-20020a056402220100b0044f443e2a78mr7865443edb.76.1663933473466; Fri, 23 Sep 2022 04:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663933473; cv=none; d=google.com; s=arc-20160816; b=NfHnXQd3JGchtDEq7M/OqW+cMXxZ9NM4LoDJGbcPpb4PvEhWTKe+ozNPo3ewzK3yH9 r3HfQ+s79C/49V5p0tyRJ5t1IY0aNNGhMS6vp03VcnHbxCzaVDWd3uHcarO7WviU+Gen j03hmzP903RwQ0aBWQd4Zotv9qIuJPvubd7SY1tc3IKlVeXIKrqxrou72SCxlqN7Xc+h ZAuzJmhG98oxyHS39pIhmfDFUB7vZ5rNz0RxvrLJv+lQV+dhxTE0p5cMuXSJGCY0S94U e5DuEzoANWFwWkgPX7wxWQlyqPTj3/nJy+OCEUxKKWyxseS/YnLkA3jvf2DsJlmeDruU J4CA== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=KJXi7SUMVY8KIe87AlQW77KmpL/ygw2qFMNXNUgQlw8=; b=D3rIOsDQkr9FSkVpyBrta6MI2mceJCOtOPpd5kJlsTCPuN0xjVtgwShQzCf8nCpUH9 cJexDkhC+xzLAL6euBOcInsUE/YehQXGw9HaI5Ni4HqyRl/J/7IkajL1Gv7PTpfcO9Ry yzCDcZ3uX85zu+VYGeeqs/ZDnRSiG3lsSi6ea8Lbe2PFLPuuHFUd2DLihKIqdvpVaHTQ OK0McnxLVL2h7sN/Lccre/32nsaAs6L8JeRT0mmSjaFvuyWu9D3V8vnFLFQMxK2Z2H4J 2kb8A3v9lScECNARw6aHwa6Uszq/7wpmiqvaTgwZbcXSybxF1uSDMHV4dQw2wY+ujci6 QszA== 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 x21-20020aa7cd95000000b0045082d5a1e6si6748215edv.468.2022.09.23.04.44.22; Fri, 23 Sep 2022 04:44:33 -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 A228B68BBB5; Fri, 23 Sep 2022 14:44:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F38668BA90 for ; Fri, 23 Sep 2022 14:44:12 +0300 (EEST) Received: by mail-qv1-f47.google.com with SMTP id m9so8831490qvv.7 for ; Fri, 23 Sep 2022 04:44:12 -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:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=BJcuBnwk2/Wb8uxurd2ewly3ttLXUAiA0Px2DH0hBsk=; b=6WzRFEtA9a+iSY/vZC6LySRZdsq0u+RiahU7CJDUknH7fcvAQ6FJEK6WpCNo0rX/Ju LfsBoT/tK9sNXuKU3xufu7AyPMr4FbEJX4yb4t6ktd1JcN6s2nrBh+N3jGLAQR6o2NkZ 9RdRXiT6gJJyOla3y696JE92Y0VZ4EytcD6Jrhj+vR0z9Q09StJZkJxabN0PyamAzlyw KIC/8o4R4bwnvmD52Izxm8k2JAtdJwmzJpKnFmxZe2rSBwho/LczoRPmbioKOuwnuqtd Qk5DfVLnmv2rePMSTHrmO4TS70WMg8u6StwVIO4v2Gz1GqbbeGy334liPjjZ087y1sLQ Zs7Q== X-Gm-Message-State: ACrzQf31OtShncOIhMIs1uyusxJ45r8aNockw2ndiNc9tmS00++njHqo ZoBNj9KzYBcxjDboAtVBI50Zenc4GlMgMg== X-Received: by 2002:a05:6214:27cb:b0:4ad:1a90:61c9 with SMTP id ge11-20020a05621427cb00b004ad1a9061c9mr6290689qvb.110.1663933450895; Fri, 23 Sep 2022 04:44:10 -0700 (PDT) Received: from localhost.localdomain ([107.159.99.23]) by smtp.gmail.com with ESMTPSA id x20-20020a05622a001400b0033aac3da27dsm5517464qtw.19.2022.09.23.04.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 04:44:10 -0700 (PDT) From: Tristan Matthews To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 07:43:35 -0400 Message-Id: <20220923114335.3242475-1-tmatth@videolan.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: CJpwH49cf9KN Fix suggested by Mark Harris. Fixes ticket #9890 Simplified after feedback from Anton Khirnov. --- libavcodec/opus_silk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index 8523b55ada..f9d67f4fb3 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -833,6 +833,8 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, int active1 = (j == 0 && !(redundancy[1] & (1 << i))) ? 0 : 1; silk_decode_frame(s, rc, i, j, coded_channels, 1, active1, 1); } + + s->midonly = 0; } for (i = 0; i < nb_frames; i++) {