From patchwork Fri Aug 21 21:57:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 21808 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5463044BB0B for ; Sat, 22 Aug 2020 01:21:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 366A268B6C5; Sat, 22 Aug 2020 01:21:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5696568A552 for ; Sat, 22 Aug 2020 01:21:40 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id d6so4302750ejr.5 for ; Fri, 21 Aug 2020 15:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ej9jGWIjItulAB5FbMgs9MgRey56S03b/Ak8TrdWDAY=; b=n3OzoF4coT/GgT2RPOKM7CxNHaEX5ReZlVLQc48ZGrOhgxg2/wmApFsrd5IiobkVHS Ca/8VY7W3XBhz66flJ/p/CwjU93MsVJOjJx/XCHLqVZNQzfqejYG2DK9xSqdm0YIufXJ C8yT2iunaPNp+Y+B6+Y1DOrOyWrIuWsHDOPWbU/hdHyXO0MDzx+6xX2o+UnvUxhlEyqm r8hzrq94qYGc0pjP+B9f4irExfi869tL/IzqH76H3KDGRzu9ucMEp5YO13sfkv3jTFvV TIeXQx81VeF2h96030pad8F80BvcStiHFI3V1NBD/0yX96Q4EeWwmrW2mBHZV1Oz+WMP oE7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ej9jGWIjItulAB5FbMgs9MgRey56S03b/Ak8TrdWDAY=; b=X1Inq/vheq/orOJ6EBqbnd0qYUmbROTU68oB5YkRpTi/q1Kh3ba51vajMQ+kVEg0+f QBG3wvIM8Ix5NT0HTq97x8DRI2xURGpsCbU7p4orLCU8Vi3Z/gjaNnn3Nh5J96O29TPD JTNe0PpRhjR35Yng4ZB6L3bi/OHeStRtZ49HSZpOHvqvoiaRzgfVF1IqDbJuMwz+Q+dl Q2CfLz8hPBoRoFkP8ih5/CPktScvh1odOCx7QXI3alOkrt4T5ukbKFx9R0O/3YJpj7Jc Uq0iJ1Bv4nhz8PeO8Cz3pXh4qGnYuO2BKTBjTGBnQHI8qbIUUUF6O8CiuvhDCkRJ3wmR R4Hg== X-Gm-Message-State: AOAM532qjQPr+tzXYMPRDxS8IsYfVZ5vkYONo2ix3TApGGkWH6iVwwzh Mc6x+5ZhxzorejcreQARZOIdI9NcqWA= X-Google-Smtp-Source: ABdhPJwonxNlYd3jMTcy/zY/HQ2tt2wnqnvR9b/Cqe69WBRm80SO+IfsLZOmrMsbqh+C4fWPvtLocQ== X-Received: by 2002:a2e:9a93:: with SMTP id p19mr2354216lji.67.1598047086256; Fri, 21 Aug 2020 14:58:06 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v10sm629134lfo.11.2020.08.21.14.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 14:58:05 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Aug 2020 00:57:59 +0300 Message-Id: <20200821215800.27162-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821215800.27162-1-jeebjp@gmail.com> References: <20200818192538.35023-1-jeebjp@gmail.com> <20200821215800.27162-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3 v2] avcodec/aacdec_template: add more checks to make sure only 22.2 gets to 22.2 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This way we can check that we have exactly the required things for 22.2. Fixes #8845 --- libavcodec/aacdec_template.c | 47 ++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 9f7016790e..63604d39fd 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -266,6 +266,7 @@ static int count_paired_channels(uint8_t (*layout_map)[3], int tags, int pos, return num_pos_channels; } +#define PREFIX_FOR_22POINT2 (AV_CH_LAYOUT_7POINT1_WIDE_BACK|AV_CH_BACK_CENTER|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_LOW_FREQUENCY_2) static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) { int i, n, total_non_cc_elements; @@ -402,46 +403,86 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) } // The previous checks would end up at 8 at this point for 22.2 - if (tags == 16 && i == 8) { + if (layout == PREFIX_FOR_22POINT2 && tags == 16 && i == 8) { + if (layout_map[i][0] != TYPE_SCE || + layout_map[i][2] != AAC_CHANNEL_FRONT) + goto end_of_layout_definition; + e2c_vec[i] = (struct elem_to_channel) { .av_position = AV_CH_TOP_FRONT_CENTER, .syn_ele = layout_map[i][0], .elem_id = layout_map[i][1], .aac_position = layout_map[i][2] }; layout |= e2c_vec[i].av_position; i++; + + if (layout_map[i][0] != TYPE_CPE || + layout_map[i][2] != AAC_CHANNEL_FRONT) + 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); + + if (layout_map[i][0] != TYPE_CPE || + layout_map[i][2] != AAC_CHANNEL_SIDE) + goto end_of_layout_definition; + i += assign_pair(e2c_vec, layout_map, i, AV_CH_TOP_SIDE_LEFT, AV_CH_TOP_SIDE_RIGHT, AAC_CHANNEL_SIDE, &layout); + + if (layout_map[i][0] != TYPE_SCE || + layout_map[i][2] != AAC_CHANNEL_FRONT) + goto end_of_layout_definition; + e2c_vec[i] = (struct elem_to_channel) { .av_position = AV_CH_TOP_CENTER, .syn_ele = layout_map[i][0], .elem_id = layout_map[i][1], .aac_position = layout_map[i][2] }; layout |= e2c_vec[i].av_position; i++; + + if (layout_map[i][0] != TYPE_CPE || + layout_map[i][2] != AAC_CHANNEL_BACK) + goto end_of_layout_definition; + i += assign_pair(e2c_vec, layout_map, i, AV_CH_TOP_BACK_LEFT, AV_CH_TOP_BACK_RIGHT, AAC_CHANNEL_BACK, &layout); + + if (layout_map[i][0] != TYPE_SCE || + layout_map[i][2] != AAC_CHANNEL_BACK) + goto end_of_layout_definition; + e2c_vec[i] = (struct elem_to_channel) { .av_position = AV_CH_TOP_BACK_CENTER, .syn_ele = layout_map[i][0], .elem_id = layout_map[i][1], .aac_position = layout_map[i][2] }; layout |= e2c_vec[i].av_position; i++; + + + if (layout_map[i][0] != TYPE_SCE || + layout_map[i][2] != AAC_CHANNEL_FRONT) + goto end_of_layout_definition; + e2c_vec[i] = (struct elem_to_channel) { .av_position = AV_CH_BOTTOM_FRONT_CENTER, .syn_ele = layout_map[i][0], .elem_id = layout_map[i][1], .aac_position = layout_map[i][2] }; layout |= e2c_vec[i].av_position; i++; + + if (layout_map[i][0] != TYPE_CPE || + layout_map[i][2] != AAC_CHANNEL_FRONT) + goto end_of_layout_definition; + i += assign_pair(e2c_vec, layout_map, i, AV_CH_BOTTOM_FRONT_LEFT, AV_CH_BOTTOM_FRONT_RIGHT, @@ -449,9 +490,11 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) &layout); } +end_of_layout_definition: + total_non_cc_elements = n = i; - if (tags == 16 && total_non_cc_elements == 16) { + if (layout == AV_CH_LAYOUT_22POINT2) { // For 22.2 reorder the result as needed FFSWAP(struct elem_to_channel, e2c_vec[2], e2c_vec[0]); // FL & FR first (final), FC third FFSWAP(struct elem_to_channel, e2c_vec[2], e2c_vec[1]); // FC second (final), FLc & FRc third