From patchwork Wed Jun 5 17:41:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp555377vqb; Wed, 5 Jun 2024 10:41:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbh8rYQn2MZjdixDGnkak18CptWOF86aC8CsclKkNJPVti2KBrEUIxmOqD95+xX/JQcXXmBo1YILowYhFBvmyGe9rvtCqTlujZug== X-Google-Smtp-Source: AGHT+IHaKBG19nDvTsYybneWm7uyEwoKRap0aNuu3RSzZ/m9LTUVNuxqNRI4IB5YtOn2I9nl+bi1 X-Received: by 2002:a50:9983:0:b0:57a:2069:e91 with SMTP id 4fb4d7f45d1cf-57a8b674ab5mr2399612a12.1.1717609298728; Wed, 05 Jun 2024 10:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717609298; cv=none; d=google.com; s=arc-20160816; b=gNTa92FkKKAkKKS0HtpW12Hz969g6MuKWs16LRK7O9bcMKDQwUUCiXRPADurrhvpmm huAqGcvfv8uf2v9xmWGxgV8uL0plYLdI/5dHx4QAtqyubXWKrfK4UjWaLOX4iGi++ofk dst1Kn79ZivemUG9Q6LDQGFXJj12VZ9MKGlCM4qH3siChnghvNvqVkQZhOQYgl1XLicY euZwRh2SjyuBSBb7KhkxdQI9zSQG2EmW657TqcWbjyJHD/a+6IJnmHn+bpeNZP7sKAxF r2E+WSUlegiiL+A+pQvuh6RyYRP9xLTQ4rJgffaI63LutBPQISTKA3CizxtgoW9MOgSn Ganw== 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=ZSSanQxx22hts555hGABTzhcJSczxc/Ygcjj3gIxFKE=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=0C3lEbC+kPEl6pAp+Zvwuvnv0liN8QVkxdSx3ZE1tRKA/yhTXfCB5eRmhDz3WtHjIh SW0BfpU2uHXxOTBrtkpxRpjiPgwcgVJuAWnAjL4XpBjaWuUKFzg0eDMBMnYyGsI3Ajg7 ZuxYub0d0Ai+mmiawIJzwVgUZFuYfu4EXWaw26TZ/X2jqfMLheBlm1G9B3geazUtAmQC lQzAQShK3fEeUZB22hYDjQ+/bEyCHNmyq60RPv4NtmsMEnpTuCSedEhCud1tSv32AGrB Mw7qpFqAw1coxfuBIMbmzFoifK2HS0lFpEhamqs1OiiaSAr4X09R56Hr3mNGQVX3bcf7 X3LA==; 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 4fb4d7f45d1cf-57a4aeee437si4972866a12.13.2024.06.05.10.41.38; Wed, 05 Jun 2024 10:41:38 -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 CF19F68D6FC; Wed, 5 Jun 2024 20:41:35 +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 282FB68D6FD for ; Wed, 5 Jun 2024 20:41:29 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 19:41:18 +0200 Message-ID: <20240605174126.2948000-1-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aacdec_usac: correctly set and use the layout map 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: ZdsBE2qSEi8b --- libavcodec/aac/aacdec_usac.c | 105 +++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 42 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 04dd5facff..561734f930 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -268,17 +268,25 @@ int ff_aac_usac_reset_state(AACDecContext *ac, OutputConfiguration *oc) /* Initialize state */ for (int i = 0; i < usac->nb_elems; i++) { AACUsacElemConfig *e = &usac->elems[i]; - if (e->type != ID_USAC_SCE && e->type != ID_USAC_CPE) + if (e->type == ID_USAC_EXT) continue; - if (e->type == ID_USAC_SCE) { + switch (e->type) { + case ID_USAC_SCE: ch = 1; type = TYPE_SCE; id = elem_id[0]++; - } else { + break; + case ID_USAC_CPE: ch = 2; type = TYPE_CPE; id = elem_id[1]++; + break; + case ID_USAC_LFE: + ch = 1; + type = TYPE_LFE; + id = elem_id[2]++; + break; } che = ff_aac_get_che(ac, type, id); @@ -318,7 +326,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, AACUSACConfig *usac = &oc->usac; int elem_id[3 /* SCE, CPE, LFE */]; - uint8_t layout_map[MAX_ELEM_ID*4][3]; + int map_pos_set = 0; + uint8_t layout_map[MAX_ELEM_ID*4][3] = { 0 }; memset(usac, 0, sizeof(*usac)); @@ -391,6 +400,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, /* Fill in the number of expected channels */ for (int i = 0; i < nb_elements; i++) nb_channels += layout_map[i][0] == TYPE_CPE ? 2 : 1; + + map_pos_set = 1; } /* UsacDecoderConfig */ @@ -404,12 +415,12 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, } for (int i = 0; i < usac->nb_elems; i++) { + int map_count = elem_id[0] + elem_id[1] + elem_id[2]; AACUsacElemConfig *e = &usac->elems[i]; memset(e, 0, sizeof(*e)); e->type = get_bits(gb, 2); /* usacElementType */ - if (e->type != ID_USAC_EXT && - (elem_id[0] + elem_id[1] + elem_id[2] + 1) > nb_channels) { + if (e->type != ID_USAC_EXT && (map_count + 1) > nb_channels) { av_log(ac->avctx, AV_LOG_ERROR, "Too many channels for the channel " "configuration\n"); usac->nb_elems = 0; @@ -425,30 +436,31 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, decode_usac_element_core(e, gb, sbr_ratio); if (e->sbr.ratio > 0) decode_usac_sbr_data(e, gb); - layout_map[i][0] = TYPE_SCE; - layout_map[i][1] = i; - layout_map[i][2] = AAC_CHANNEL_FRONT; - elem_id[0]++; + layout_map[map_count][0] = TYPE_SCE; + layout_map[map_count][1] = elem_id[0]++; + if (!map_pos_set) + layout_map[map_count][2] = AAC_CHANNEL_FRONT; break; case ID_USAC_CPE: /* UsacChannelPairElementConf */ /* UsacCoreConfig */ decode_usac_element_core(e, gb, sbr_ratio); decode_usac_element_pair(e, gb); - layout_map[i][0] = TYPE_CPE; - layout_map[i][1] = i; - layout_map[i][2] = AAC_CHANNEL_FRONT; - elem_id[1]++; + layout_map[map_count][0] = TYPE_CPE; + layout_map[map_count][1] = elem_id[1]++; + if (!map_pos_set) + layout_map[map_count][2] = AAC_CHANNEL_FRONT; break; case ID_USAC_LFE: /* LFE */ /* LFE has no need for any configuration */ e->tw_mdct = 0; e->noise_fill = 0; - layout_map[i][0] = TYPE_LFE; - layout_map[i][1] = i; - layout_map[i][2] = AAC_CHANNEL_LFE; - elem_id[2]++; + layout_map[map_count][0] = TYPE_LFE; + layout_map[map_count][1] = elem_id[2]++; + if (!map_pos_set) + layout_map[map_count][2] = AAC_CHANNEL_LFE; + break; case ID_USAC_EXT: /* EXT */ ret = decode_usac_extension(ac, e, gb); @@ -458,7 +470,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, }; } - ret = ff_aac_output_configure(ac, layout_map, elem_id[0] + elem_id[1] + elem_id[2], OC_GLOBAL_HDR, 0); + ret = ff_aac_output_configure(ac, layout_map, elem_id[0] + elem_id[1] + elem_id[2], + OC_GLOBAL_HDR, 0); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Unable to parse channel config!\n"); usac->nb_elems = 0; @@ -1531,9 +1544,11 @@ static int parse_ext_ele(AACDecContext *ac, AACUsacElemConfig *e, int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, GetBitContext *gb, int *got_frame_ptr) { - int ret, nb_ch_el, is_dmono = 0; + int ret, is_dmono = 0; int indep_flag, samples = 0; - int audio_found = 0, sce_count = 0; + int audio_found = 0; + int elem_id[3 /* SCE, CPE, LFE */] = { 0, 0, 0 }; + AVFrame *frame = ac->frame; ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, @@ -1543,42 +1558,46 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, indep_flag = get_bits1(gb); - nb_ch_el = 0; for (int i = 0; i < ac->oc[1].usac.nb_elems; i++) { + int layout_id; + int layout_type; AACUsacElemConfig *e = &ac->oc[1].usac.elems[i]; ChannelElement *che; + if (e->type == ID_USAC_SCE) { + layout_id = elem_id[0]++; + layout_type = TYPE_SCE; + che = ff_aac_get_che(ac, TYPE_SCE, layout_id); + } else if (e->type == ID_USAC_CPE) { + layout_id = elem_id[1]++; + layout_type = TYPE_CPE; + che = ff_aac_get_che(ac, TYPE_CPE, layout_id); + } else if (e->type == ID_USAC_LFE) { + layout_id = elem_id[2]++; + layout_type = TYPE_LFE; + che = ff_aac_get_che(ac, TYPE_LFE, layout_id); + } + + if (e->type != ID_USAC_EXT && !che) { + av_log(ac->avctx, AV_LOG_ERROR, + "channel element %d.%d is not allocated\n", + layout_type, layout_id); + return AVERROR_INVALIDDATA; + } + switch (e->type) { case ID_USAC_LFE: /* Fallthrough */ case ID_USAC_SCE: - che = ff_aac_get_che(ac, TYPE_SCE, nb_ch_el++); - if (!che) { - av_log(ac->avctx, AV_LOG_ERROR, - "channel element %d.%d is not allocated\n", - TYPE_SCE, nb_ch_el - 1); - return AVERROR_INVALIDDATA; - } - ret = decode_usac_core_coder(ac, &ac->oc[1].usac, e, che, gb, indep_flag, 1); if (ret < 0) return ret; - sce_count++; audio_found = 1; che->present = 1; - samples = ac->oc[1].m4ac.frame_length_short ? 768 : 1024; break; case ID_USAC_CPE: - che = ff_aac_get_che(ac, TYPE_CPE, nb_ch_el++); - if (!che) { - av_log(ac->avctx, AV_LOG_ERROR, - "channel element %d.%d is not allocated\n", - TYPE_CPE, nb_ch_el - 1); - return AVERROR_INVALIDDATA; - } - ret = decode_usac_core_coder(ac, &ac->oc[1].usac, e, che, gb, indep_flag, 2); if (ret < 0) @@ -1586,7 +1605,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, audio_found = 1; che->present = 1; - samples = ac->oc[1].m4ac.frame_length_short ? 768 : 1024; break; case ID_USAC_EXT: ret = parse_ext_ele(ac, e, gb); @@ -1596,6 +1614,9 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, } } + if (audio_found) + samples = ac->oc[1].m4ac.frame_length_short ? 768 : 1024; + if (ac->oc[1].status && audio_found) { avctx->sample_rate = ac->oc[1].m4ac.sample_rate; avctx->frame_size = samples; @@ -1619,7 +1640,7 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, } /* for dual-mono audio (SCE + SCE) */ - is_dmono = ac->dmono_mode && sce_count == 2 && + is_dmono = ac->dmono_mode && elem_id[0] == 2 && !av_channel_layout_compare(&ac->oc[1].ch_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO); if (is_dmono) {