From patchwork Tue Aug 18 19:25:37 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: 21709 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 DAFC5447941 for ; Tue, 18 Aug 2020 22:33:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9DCC6880D5; Tue, 18 Aug 2020 22:33:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B564687FF1 for ; Tue, 18 Aug 2020 22:33:12 +0300 (EEST) Received: by mail-lj1-f195.google.com with SMTP id i10so22752040ljn.2 for ; Tue, 18 Aug 2020 12:33:12 -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=OD3o9fq+dy4zC3A1zPI3NjmLatfpR+IJDODopgn4GOU=; b=Hjtv9Vpcj5JXzXubRWadTE3i68f0dBmNYRy9nhjnDxM1Hi6SqLxgqqlRIGbv42Q6xN Yed4gmEXwigmYROTcFCwjc9vFyJRud2AYLWoPOkrrLUaAXWlYjWMAX7WGebEwSzYE1XO 3srcQkIk6IEou0y5WUGmPqIBau9ACQzLM+YYFnkdgRNY9Dfdxv3hEowQYetEaHVcYnOI u08JV/kWJepxkCzV9XnNRzzXF3XYYjWmkiZsYfg9/B7hKlbPwvkgDM2H4rRVGfuYTsUS te4N+BIwhoJ5lx9aK9Ythhs5WEKO4eBKcOa+dzVwM2q2ngAy+bYM+q5HWNMP73kUHVTN bQXQ== 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=OD3o9fq+dy4zC3A1zPI3NjmLatfpR+IJDODopgn4GOU=; b=Ds6ZG+lGZiHKW4tEHM45DzQ00YIw/bXikR4xB0ybfKM1ZbcKVO7EM/QxHuPIkBJWxy tQ8Bd5zfyS4hBrp1M5kinWZ774aAiVhdR68jQdgldpM7GPt6eM+8ERLcpVNIiqiETUuQ 32qkYzOqS46L0Pw40UUPOqOImcfLb70zSxiBFplqDYWA24uc3OLqPO6ROicWSeNBYSr+ BahhGMBYEjCaunikRgzDfYBjuJ3VA6TxZ2nhzTSNSo3T4qV/D+u9o4iDl7oV8PLF/NGf s+wRcvFynLFsXA+B5q+7HMEksZveTK5stXi3wXN51A+yu6CZnJuwTq07ivYNo6RqJguQ yXRg== X-Gm-Message-State: AOAM531fMdDk9dyVWmB49fb+NCVzS+tdMDyGtGFrLq4KIyStmC7KXSJc XIdlGCOwsICWjmhn86o4/fWDxutL7kI= X-Google-Smtp-Source: ABdhPJzvkgCHCn2Y1PIEMko5eQN+eu8IzOSVW4V8g8CkEIOzn04YE6VlxSclvk3NHMaL2x3QwBVigw== X-Received: by 2002:a2e:9a53:: with SMTP id k19mr10578670ljj.272.1597778742294; Tue, 18 Aug 2020 12:25:42 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id 1sm6140940ljr.6.2020.08.18.12.25.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 12:25:41 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Aug 2020 22:25:37 +0300 Message-Id: <20200818192538.35023-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818192538.35023-1-jeebjp@gmail.com> References: <20200818192538.35023-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] 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 | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 9eef1c0158..1e112ccf76 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -263,6 +263,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; @@ -399,46 +400,78 @@ 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][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][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][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][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][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][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][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][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, @@ -446,9 +479,12 @@ 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 && + tags == 16 && total_non_cc_elements == 16) { // 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