From patchwork Wed Jun 5 03:08:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp105920vqb; Tue, 4 Jun 2024 20:09:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7QvWI5A6QnwTrDvg3TJQ+4C2bYMwg1de2HNWfedYymD7aKePgAOQ61FBzJJ3zi6CLuL9T3fkOuqUStE6Pw5BRNryy5ElCHBXo8Q== X-Google-Smtp-Source: AGHT+IGNYt14OYChEWh6Btpm/rS0Xcm2O/1mniWQVM8cWkgO6GHwGdsbsL7HK8bUkjHhZ95H3OAN X-Received: by 2002:a17:906:b09:b0:a5a:89a8:49c5 with SMTP id a640c23a62f3a-a699d862f04mr104670666b.33.1717556949136; Tue, 04 Jun 2024 20:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717556949; cv=none; d=google.com; s=arc-20160816; b=W9ZuqVUr5/pdRoRLybj/cW5h5GzH5HG1bVe63AO8Ruqc5uiihxuMf3UCxjO+4tO+Zy UA7Hs4j1jAEjpdYbMEAeSfL63YMazPIFU66++yzFjdxzHoe6U9AhdwyZiTzlzkryQS6l SLMJBjAjA04U5e00td0mw/zi1eddqVxddJQ02FVvGjc7dy1Ld0fweveb7DuGsFP3OkWo mG3bSYp/4x4FQzZIrnD4PjmbfrpFUqp8zsdUlYKI2BOpbwkYclVZdPfEGP1xZ2Ae1fvw J0/MZldndAC/pGdkFLTAbC/ptOZYYl1kfbxty9fYCH+P/o9m6LvP46EaFxxMVIja0qyC 6jJQ== 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:message-id:date:to :delivered-to; bh=xx04E/hItfXhAqZJFsFwBtZSIx08PCtsjO6c+tR1gfY=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=iVXnMhWLBPC4pmjQCRUvgSbTMFeSG7lbX2FRfZ54pRQoh5G/g32HJqKzv4LHLP2rrA m47LisiOXMdg+xm5osrX8jhJ9pGy5tBFM6Fzon8rmGG+4RnoOwWjL0350dBLuOp7T470 D26DpwdI1CirGrUxa4jCcDYVcuHnvlMiEd1kV1UUzE0oL0TTGvyPyQVecWsYsuVopsl+ soktu/a6MKARn3jYjkgEEnvvE2eLdiGC8V7uiF7FjR6Vai2XP8hwRx1xWxlLZtT7NQob GEF2iadbfCphpltKPIFR6C6zMgDa5VbzskrKu7jBXj4N0nXAvTri3BLFuFN0vP4SkqcC Pw6w==; 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-a69049bf805si271958266b.888.2024.06.04.20.09.08; Tue, 04 Jun 2024 20:09:09 -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 42AD568D709; Wed, 5 Jun 2024 06:08:54 +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 3B92368D709 for ; Wed, 5 Jun 2024 06:08:46 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 05:08:35 +0200 Message-ID: <20240605030843.2807174-1-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] mpeg4audio: rename AOT_USAC_NOSBR to AOT_USAC 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: zApbZtrsVakh The issue is that AOT 45 isn't defined anywhere, and looking at the git blame, it seems to have sprung up through a reordering of the enum, and adding a hole. The spec does not define an explicit AOT for SBR and no SBR, and only uses AOT 42 (previously AOT_USAC_NOSBR), so just rename AOT_USAC to it and replace its use everywhere. --- libavcodec/aac/aacdec.c | 7 ++----- libavcodec/mpeg4audio.h | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 2b8322fc68..24d2bdde4c 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1046,7 +1046,6 @@ static int decode_audio_specific_config_gb(AACDecContext *ac, return ret; break; #if CONFIG_AAC_DECODER - case AOT_USAC_NOSBR: /* fallthrough */ case AOT_USAC: if ((ret = ff_aac_usac_config_decode(ac, avctx, gb, oc, m4ac->chan_config)) < 0) @@ -1571,8 +1570,7 @@ int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns, GetBitContext *gb, const IndividualChannelStream *ics) { int tns_max_order = INT32_MAX; - const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC || - ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR; + const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC; int w, filt, i, coef_len, coef_res, coef_compress; const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; @@ -2421,8 +2419,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame, ac->tags_mapped = 0; - if ((ac->oc[1].m4ac.object_type == AOT_USAC) || - (ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR)) { + if (ac->oc[1].m4ac.object_type == AOT_USAC) { if (ac->is_fixed) { avpriv_report_missing_feature(ac->avctx, "AAC USAC fixed-point decoding"); diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 56615ef321..5daba7824b 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -108,10 +108,9 @@ enum AudioObjectType { AOT_ER_AAC_ELD, ///< N Error Resilient Enhanced Low Delay AOT_SMR_SIMPLE, ///< N Symbolic Music Representation Simple AOT_SMR_MAIN, ///< N Symbolic Music Representation Main - AOT_USAC_NOSBR, ///< N Unified Speech and Audio Coding (no SBR) + AOT_USAC, ///< Y Unified Speech and Audio Coding AOT_SAOC, ///< N Spatial Audio Object Coding AOT_LD_SURROUND, ///< N Low Delay MPEG Surround - AOT_USAC, ///< N Unified Speech and Audio Coding }; #define MAX_PCE_SIZE 320 ///