From patchwork Fri Oct 28 12:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp754578pzd; Fri, 28 Oct 2022 05:23:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4oJBRIwi3fgCKcPczFT3BYbSiBKiDIaWxbVAf6sdPJp5Mofex3hTdKzHKSuXkvzWa05doc X-Received: by 2002:a17:906:9b92:b0:791:9355:cb89 with SMTP id dd18-20020a1709069b9200b007919355cb89mr45896570ejc.498.1666959789572; Fri, 28 Oct 2022 05:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666959789; cv=none; d=google.com; s=arc-20160816; b=VBv0aTCkTW4Ki3fhLXZo++2okiLGvWZP64oihL/RWitEXeMrmiOpxpjpykig57crxy uKTjCh89QVPAgDYPpIR1EhANtJKq851j+cpSKjdTqMpSAOWzsRUgEQugL1nU6ATYAj2Q vKJt18R6OVsbIdEcoWKj+LDQsFD4IWGe5PtxZAT7NLWhzXoHuSMT6KLo7ZMkMhy505Jl HSm7gEnvCMACVvTs7yOrEX2CIxdmVCjpASKZWJlco17u9b7vVjAzQlPNHXVgnZ3IJw0f o8d+g47pCzkqFmmsmluXkx5mDPkaG+fSCnPUn6dAXKpO3fIrAMBd1T0DGUBDd8r1Z4vR rwBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=T5ASFnDSpumZEUnnHRIZ5eTrNSmC/CG3tboaBHhHKkQ=; b=RPQ4uq34SROvE/xR5c86pg0QcPGy6KTDQMvWtOn/AVRdE8vxfRkntq7wfxFhr5oAcn mhHPPcpa++VIwfXG5cxuI3kOPstM4dUMW1jqxrTbZBI6SZ3ubZ6b8/my5+ZCih1puuAy pM08oO4Ww3PrpSzccBK0sBVjljGa5P2NYJKIXBdkbnQG8o0oRI864O15ff9qSSAzliS2 xExWSkVZRnkvh2u2+UeP8tgBml5G633UrnWa8/PRBDpIJuPkVy36iKK0cc8Pdvf+rnY8 /UcRBAqbXFUdCC8NB81hv7IMpkZ8duOHm3Xb/WFa4AdSbEgO1Z2kdNLyK5zqdNawIU1w 3a3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Vsvjx5Ws; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z17-20020a05640240d100b0045ca15afe1csi4273346edb.553.2022.10.28.05.23.08; Fri, 28 Oct 2022 05:23: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Vsvjx5Ws; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DC2868BCF4; Fri, 28 Oct 2022 15:22:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB53568BCD7 for ; Fri, 28 Oct 2022 15:22:44 +0300 (EEST) Received: by mail-oi1-f178.google.com with SMTP id i7so5965684oif.4 for ; Fri, 28 Oct 2022 05:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Y0DUU2CDdLxmsW/PR7SscpXs6R0rJXxO7CSpyvexZjU=; b=Vsvjx5WsAKQPsBBsP0HWHTy4dD3hXa/p7Fc0MVr7ck55O1kl/GOC4v4X0L5KiuLC3l XxBDJ/CVCycC27q9Oaadf6s0jGRd5IolKXytSumVYOhCOZSWyYq/5T72bERFjzj3eZVI /OnnBPWq01Ff+H21uxDqDqJVAA7Yu15bI4k61WvWjxw4G21kJy/NtWV0n5q/ZzBAKBt9 ygzqQJlUKzkwD8Zzl3egnghEh9fqRSDkDO2hV7HVwqBsd5Ge1IFWUXCthyaUtxpt/Px3 yH6bnV8XhlusnWBjVNsJORa2QRODkCrKwljUUuuD8SPVF9vy3CZYl+08QAd9kZHB9zZt 3sDQ== 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y0DUU2CDdLxmsW/PR7SscpXs6R0rJXxO7CSpyvexZjU=; b=5P72DnlQnHCc8hXvM+OpDw0nJcJarCZC4NKIfQ5Cvn+xv+6Oa6IqWNmSjD+uaJP34+ Sd15SSiJttNBxgVb9LJgoUsq8MsmjO+P5P3PA3GX1FhCfk8dPUuj/NJ7WlBwywT4pKOi LqaSRQkBoOPM8X6uVLhjhAouiNbuB8HRxDW1X2naynOIje8XjP3o5MM4ez/h5AsYWWEa kHuGCYrhTzQDd/riiTQOPFLU2KtQQgu1DXkhgvMDndR7igjOrfdTVf96OtLTM+OABDU8 +7obLvSx264KzhbT+TvosxzW5KrLnO0cSzMJkyTMN8SwWIXvzclp7a+UGo3z4YFAEatM eaWQ== X-Gm-Message-State: ACrzQf2KWOgwtXZRJb11mzj7x74vIk9s9sb19TnXagVfv/nCT0WIqybg R9q0rKI62cd/KwZ6IXM3EQz8Xf1hbxw= X-Received: by 2002:a05:6808:1184:b0:350:f681:8c9a with SMTP id j4-20020a056808118400b00350f6818c9amr8041879oil.282.1666959763004; Fri, 28 Oct 2022 05:22:43 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id v206-20020acaacd7000000b0035028730c90sm1458869oie.1.2022.10.28.05.22.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:22:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 09:21:39 -0300 Message-Id: <20221028122140.1885-3-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221028122140.1885-1-jamrial@gmail.com> References: <20221028122140.1885-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4 v2] avcodec/aacdec: add support for channel configuration 14 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0GcXEpb0TFBe It corresponds to the 7.1(top) layout. Signed-off-by: James Almer --- libavcodec/aacdec_template.c | 23 ++++++++++++++++++++++- libavcodec/aacdectab.h | 6 +++--- libavcodec/mpeg4audio.c | 5 +++-- libavcodec/mpeg4audio.h | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index c10bc743b6..4b8e29ba71 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -404,6 +404,21 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) i++; } + // The previous checks would end up at 4 at this point for chan_config 14 + if (layout == AV_CH_LAYOUT_5POINT1 && tags == 5 && i == 4) { + const uint8_t (*reference_layout_map)[3] = aac_channel_layout_map[13]; + for (int j = 0; j < tags; j++) { + if (layout_map[j][0] != reference_layout_map[j][0] || + layout_map[j][2] != reference_layout_map[j][2]) + goto end_of_layout_definition; + } + + i += assign_pair(e2c_vec, layout_map, i, + AV_CH_TOP_FRONT_LEFT, + AV_CH_TOP_FRONT_RIGHT, + AAC_CHANNEL_FRONT, + &layout); + } // The previous checks would end up at 8 at this point for 22.2 if (layout == PREFIX_FOR_22POINT2 && tags == 16 && i == 8) { const uint8_t (*reference_layout_map)[3] = aac_channel_layout_map[12]; @@ -633,7 +648,7 @@ static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx, int channel_config) { if (channel_config < 1 || (channel_config > 7 && channel_config < 11) || - channel_config > 13) { + channel_config > 14) { av_log(avctx, AV_LOG_ERROR, "invalid default channel configuration (%d)\n", channel_config); @@ -717,6 +732,12 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) /* For indexed channel configurations map the channels solely based * on position. */ switch (ac->oc[1].m4ac.chan_config) { + case 14: + if (ac->tags_mapped > 2 && ((type == TYPE_CPE && elem_id < 3) || + (type == TYPE_LFE && elem_id < 1))) { + ac->tags_mapped++; + return ac->tag_che_map[type][elem_id] = ac->che[type][elem_id]; + } case 13: if (ac->tags_mapped > 3 && ((type == TYPE_CPE && elem_id < 8) || (type == TYPE_SCE && elem_id < 6) || diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index b820f10556..e9bbd1fe13 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -68,8 +68,8 @@ static const uint8_t aac_channel_layout_map[16][16][3] = { { TYPE_SCE, 5, AAC_CHANNEL_FRONT }, // SCE6 = BtFC, { TYPE_CPE, 7, AAC_CHANNEL_FRONT }, // CPE8 = BtFL and BtFR }, + { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_SIDE }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, { TYPE_CPE, 2, AAC_CHANNEL_FRONT }, }, { { 0, } }, - /* TODO: Add 7+1 TOP configuration */ }; #if FF_API_OLD_CHANNEL_LAYOUT @@ -84,8 +84,8 @@ static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_22POINT2, + AV_CH_LAYOUT_7POINT1_TOP, 0, - /* AV_CH_LAYOUT_7POINT1_TOP, */ }; #endif @@ -100,8 +100,8 @@ static const AVChannelLayout aac_ch_layout[] = { AV_CHANNEL_LAYOUT_6POINT1, AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_22POINT2, + AV_CHANNEL_LAYOUT_7POINT1_TOP, { 0 }, - /* AV_CHANNEL_LAYOUT_7POINT1_TOP, */ }; #endif /* AVCODEC_AACDECTAB_H */ diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index e38a8c0852..4a996411d1 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -56,7 +56,7 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c, void *logctx return 0; } -const uint8_t ff_mpeg4audio_channels[14] = { +const uint8_t ff_mpeg4audio_channels[15] = { 0, 1, // mono (1/0) 2, // stereo (2/0) @@ -70,7 +70,8 @@ const uint8_t ff_mpeg4audio_channels[14] = { 0, 7, // 3/3.1 8, // 3/2/2.1 - 24 // 3/3/3 - 5/2/3 - 3/0/0.2 + 24, // 3/3/3 - 5/2/3 - 3/0/0.2 + 8 // 3/2.1 - 2/0 }; static inline int get_object_type(GetBitContext *gb) diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index a6f71cff58..56615ef321 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -42,7 +42,7 @@ typedef struct MPEG4AudioConfig { } MPEG4AudioConfig; extern const int ff_mpeg4audio_sample_rates[16]; -extern const uint8_t ff_mpeg4audio_channels[14]; +extern const uint8_t ff_mpeg4audio_channels[15]; /** * Parse MPEG-4 systems extradata from a potentially unaligned GetBitContext to retrieve audio configuration.