From patchwork Thu Jun 6 05:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp142940vqo; Wed, 5 Jun 2024 22:13:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWL3wY2nl7ZADclvSEy67W0zEWT7SUXAuqCEpPpqNjsBoZalyagg/qWqUtb3vVKhli/udBmSJgDKDQCuMaM4MgZzKnhTmZQY2mTrQ== X-Google-Smtp-Source: AGHT+IEUJK5xvx2zLYjRDPJeVtM8mv+qZu7Pg1iBMORyxrcGDPQpXIUfKKiiG8GzhY7Q5S/QQHPf X-Received: by 2002:a17:906:d10c:b0:a59:a356:3f6d with SMTP id a640c23a62f3a-a69a024d5b7mr263116966b.54.1717650790713; Wed, 05 Jun 2024 22:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717650790; cv=none; d=google.com; s=arc-20160816; b=oZ95Z2L0R0ZPBACyaSvUherwYAYvFpRuFpIC6maS7OrxQuF7xw2HQoN21qGwoDEl+3 l4TAfpz4iPrITIVNFVBwuqnZ7a2lNI9LI7avjcqTFYaRG4tJHhdzf/eaOqCHUACLkh0b lUwXSfCXzvyoBp6KgW69qu0CMw3S+HXLZ/51qc8+Tr2UsoDp0TMoi96cSdFvYznkHo+x 6cV2boCcCKPEFcq0zSSXhP/8MIOTMQ78+6uNfu4MXFmkuJgmUxhiMefKK3dL/npvlbw3 W4yDyfQIYzJOzXDRSPhmYPeMjl/TZ38HCjFY+ivgX01JfSOfQ40D7j4xJO3fTG3uWu0U ZFGg== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=dp8k4l3EQ37o8iVmZlsRExYUcoaRrz9d+t6wbO62HYc=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=fJ01NTkko+1X7K/wnk1sQzN3BIcH8Q2ofoidfPHu9/XOhwyugYolpl+Xezo47W8clM ypgGDH1ZU6nCfK6a0RyaYbVgqMB0HMb00M3oxTeDguQ57qxqtifQbpfE4fKAesHLgDfI Lts5oa3RZxLQ6lX4t3sng+ddZue6nizXo9eR1TjwXErvSeSKiVbvpgC5hOAunaEp6y99 UBaOzSPyjVqpr56xDt1B1LKJJ/th+qiq7bZDPDoX2dSAaYHcdi2qZ29nIU+/Te4TGEYm BWX7jjypcgoKOufKnqcxyyzEFomrkM0R+kLBpz4X40o82LzalqwTUXb8Slh4xFkacrHo 77xA==; dara=google.com 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 a640c23a62f3a-a6c80706fe7si28106166b.654.2024.06.05.22.13.10; Wed, 05 Jun 2024 22:13:10 -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 23E7968D53F; Thu, 6 Jun 2024 08:12:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E51B368D4F4 for ; Thu, 6 Jun 2024 08:12:47 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2024 07:12:33 +0200 Message-ID: <20240606051243.3177266-2-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <20240606051243.3177266-1-dev@lynne.ee> References: <20240606051243.3177266-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] aacdec_usac: do not continue parsing bitstream on core_mode == 1 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QU1CtyyCmbEM Although LPD is not functional yet, the bitstream ends at that point. --- libavcodec/aac/aacdec_usac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 3b4e980df4..9b28a9e90b 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1301,6 +1301,7 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac, ret = ff_aac_ldp_parse_channel_stream(ac, usac, ue, gb); if (ret < 0) return ret; + continue; } if ((nb_channels == 1) ||