From patchwork Tue Apr 2 21:44:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ted Meyer X-Patchwork-Id: 47738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp40412pzb; Tue, 2 Apr 2024 14:45:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUwNQlG/FlPzss+hn+Wxgm/J2ewMTsosxIoZMXs04PaWWjjpof9Off/NHnJxyyWL08GLizkB8933fnj+6FAAcmyTLKa1cTAv8i1w== X-Google-Smtp-Source: AGHT+IEVLfBZUATAO8/IDkDT5FowEIVQwN9z/fnASlV2a3YjaC7XswD3ezCMPQOsG0eOjv1txv8y X-Received: by 2002:a05:6402:2790:b0:56c:195d:b162 with SMTP id b16-20020a056402279000b0056c195db162mr764348ede.6.1712094303367; Tue, 02 Apr 2024 14:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712094303; cv=none; d=google.com; s=arc-20160816; b=sIiQX5BSjg8liZMS2hEK1t11+cZH34XFYGR3dwXe6l5+JrXVTiT53IO14SCcjys+wa wXUhqNv8bcWbCLfBJinWUXHAxXLjJbSEBn3ki1gCjYVRI0RRE6sWr1OB7GxoCJ5/vVUC 8JhqeRVOEHWHI5Ohf+KDUuMZU2LIL1pwyzSx1OBuo88raHSspG34Qa+aXzQ3jyFexryY XHXTKFhznoCJfzqnB98vYBcrGTk3ED6Uy/5LdRBe/AG8fyj6REfq/ZLrsnkKH5KQ1Zcu jUXU5vAuxMxcDr+VLN+VwZfXubF5SErf9Pm5G+MMUz+owSfjGDncP4AG0AH4SvGTk3Ux 4z8A== 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:to:message-id:mime-version:date :delivered-to; bh=U9v0hrPTuuNqtlnLFciz9eHY7GYHgVq34FNE4sjox0g=; fh=3kDEDK7f4S1d/HXEI61ihbMAga2IE2ivl5CmN1GUNLk=; b=F4x5RTehCLGIIzcO5/ZUQsoChsSxxHZUoIhpIwpcrI2Ifz1aXOrNDqwL6t3g+3JXeV f2JiZfGqK1N19hwO6MrjwHpevdqp2u7YqhQ8eeoIzMAiaolk2a/YeQ2AethWMqWsmgOF qUCTiuOQPUBpwyVBdPP55JnU+eIYviVoshD3nFFKp+yyfvWI6lxzzZ7bsWoGjT18/LGW xdkG57/H+Ltl01Z3oVDJi5heE28CzgtBSwNwdv/K7tVhaiMNS6WwjjKpw0vP2UZQ8Cvo Ujw6VgCCsANnTUnUsqEFR4ScMrZ9x+HZ2QeG31bBxHH0HenmphMrbxG++I8a2wimUzZ1 MpEQ==; 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 en25-20020a056402529900b0056bec94dc31si6149303edb.683.2024.04.02.14.45.03; Tue, 02 Apr 2024 14:45:03 -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 0546068CF59; Wed, 3 Apr 2024 00:45:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5027B68CDB6 for ; Wed, 3 Apr 2024 00:44:53 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dd944567b6cso7599996276.2 for ; Tue, 02 Apr 2024 14:44:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712094291; x=1712699091; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iOU1eTnqRBVzHsBvSEP2hPQ9NVtdq2zAA6nUyL7nGGQ=; b=PXF+w/bjJgWsy+NrLTYk1YGo248JzYbBUusBhehtHT9+Oh+tRIqQyrRWf6XuRiKADi C028aXTFhlbBdyeq23y/Y2qSA7Xef80hQ1XiDojC2e7uuVMiLMjqtxG6lM3mDl3wB+cP c/QK9F0t0NHOUsD3eYnT/Pp9dPzmbpI/fAzHzBpSpCgIw3KTlXLdexhgCTnG6Exz8/rA FXwkVBaUjxy/BQe0JHltsTS3XBT2xQy9Alb2Y7z932OTwypjvHA+nZMeU+EJma1K7TIz po5KFMEoGdDe9taMe6KpHfp8Gyte/XO5oq6o/B/Xo4PtcT5hilpylmtrwR7zHriAznpi hGWA== X-Gm-Message-State: AOJu0YzQsGw/+fyIUCSvxtoQY2VAsXkG+IwfM7actlyMgCV6/L9fpuiu xoUeMpsn3tjBD/DDpoM5SiLt+g6VfnsdjU4a0YsnkwK/1/iKN3daffl8DYx/YGqCnqfgZwkcB3z PT+5ssixR5cWzStC/wOoLZmJIAwJhA6wq8E4hDAlOYmxc0K/IN/rQqAXH0OdiNFZAbngBspLwNp mm5+qSOXPXt5Ky2VnWlVTKg4an43i0fnaHxrvv6NRYl9m8E3U1AR6Fszw= X-Received: from tmathmeyer98.kir.corp.google.com ([2620:15c:7d:6:e02b:4c9e:1f6f:96a2]) (user=tmathmeyer job=sendgmr) by 2002:a05:6902:1883:b0:dce:30f5:6bc5 with SMTP id cj3-20020a056902188300b00dce30f56bc5mr1111449ybb.4.1712094291487; Tue, 02 Apr 2024 14:44:51 -0700 (PDT) Date: Tue, 2 Apr 2024 14:44:35 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240402214435.3928635-1-tmathmeyer@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Add AAC_xHE case to aacdec_template.c for demuxing 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: Ted Meyer via ffmpeg-devel From: Ted Meyer Reply-To: FFmpeg development discussions and patches Cc: Ted Meyer , tmathmeyer@chromium.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RizNMFUKVcvZ From: Ted Meyer The parser needs to be able to be created when demuxing, otherwise the channel count and layout can't be successfully generated. Signed-off-by: Ted Meyer --- libavcodec/aacdec_template.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index aa856d7fe1..9afa3aba83 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1022,6 +1022,7 @@ static int decode_audio_specific_config_gb(AACDecContext *ac, case AOT_AAC_LTP: case AOT_ER_AAC_LC: case AOT_ER_AAC_LD: + case AOT_USAC_NOSBR: if ((ret = decode_ga_specific_config(ac, avctx, gb, get_bit_alignment, m4ac, m4ac->chan_config)) < 0) return ret;