From patchwork Fri Aug 21 21:58:00 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: 21809 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 972A844BB15 for ; Sat, 22 Aug 2020 01:25:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7358F68B6CB; Sat, 22 Aug 2020 01:25:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FD4168B4A9 for ; Sat, 22 Aug 2020 01:25:09 +0300 (EEST) Received: by mail-ej1-f42.google.com with SMTP id o23so4331106ejr.1 for ; Fri, 21 Aug 2020 15:25:09 -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=G3KedyouCwh6K3avCQ1Z/7V/GGC4vtzJpf7GkI24s1w=; b=VTlCiRlYsWxPzeWnFU4cmhikBJJnF4/o/+0pKSlBXvVWPb4I+XZF5zFeKYxKLjoodg 49fkLKcQN1ftRGyA8Qsz+mroz4Vp8sW2ibfhgfo7s3p8DQeJoz2XqZLml42kP4/3f9pT qAsdbQnPGLCQTrsmPqQ/b4vsF+OVDIbDpXqkvmj1JJYc1+/bxR+5FbKi57x80zz5YoHw lNFGiBuZpbatsnl0eoeYY+wzJKw2lBjpzTRtholGtksLzEzOKWLuw2Vlf1DeCeDWSNUR pZVm2reuAbwSIe+tWE76wKbOVumbVPDgwUAxxLE8iRLlJ8dmnqKgCeklChOv+++kFyvi 3uyQ== 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=G3KedyouCwh6K3avCQ1Z/7V/GGC4vtzJpf7GkI24s1w=; b=oB1Mc7gdePA9NVGFtBiETRzAMv35bJDw9drcapJfJD4Ek2JBBv3JidHfhluivNagpQ lZCRYX1bu/gwTbPuE8uxCeoNDhc8jHPJhnPo65OA5n4qCoE2vNxeInb1zVOq/S/hWd66 Qb0PgtWnWBFzjf/uuCAyvm+y6TII12IjNioNdmUUxxvl2rPFJ+yHrkf3xEVnvURqyAI6 jasL5CMFr9+/EjHyP1/0FACYZm8X2IIC+nlzmU47r4Cvt3WopcnjAPHz3xRxre6mK6kH 3lLn4gNkI7xRX5qyEz7SA1z73rwkFIzTk/Kz0yzo7X07SyRRjkKjtGm997JmlPBWXzB3 KkfA== X-Gm-Message-State: AOAM533hMKbr7APglw178LkUb+MvHc0xq9hmQQpwgdHxks1hKdOjHwEm lDxAWmCEpAILKlrbDMC10+D6S0Tu0Mw= X-Google-Smtp-Source: ABdhPJyt5ltHz5PK8DfZpU4hkkFjSyonz5LkpaJDrc70ig9Pv7X8Zz4TrUTLJWvOuMxbUI5PqSQkgQ== X-Received: by 2002:a05:651c:d5:: with SMTP id 21mr2179951ljr.276.1598047088023; Fri, 21 Aug 2020 14:58:08 -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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 14:58:06 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Aug 2020 00:58:00 +0300 Message-Id: <20200821215800.27162-4-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 3/3] avcodec/aacdec_template: log the element order before/after reordering 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 was quite useful to verify that 22.2 got properly handled, among other things. --- libavcodec/aacdec_template.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 63604d39fd..b9b9ae5324 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -266,6 +266,22 @@ static int count_paired_channels(uint8_t (*layout_map)[3], int tags, int pos, return num_pos_channels; } +static void log_e2c(int num, struct elem_to_channel e2c) { + char buf[128] = { 0 }; + + av_get_channel_layout_string(buf, sizeof(buf), -1, e2c.av_position); + + av_log(NULL, AV_LOG_DEBUG, + "tag %d = { position(s): %s (0x%"PRIx64"), syn_elem: %s, elem_id: %"PRIu8" }\n", + num, + e2c.av_position == UINT64_MAX ? "Unset/Ignored" : buf, + e2c.av_position, + e2c.syn_ele == TYPE_SCE ? "SCE" : + e2c.syn_ele == TYPE_CPE ? "CPE" : + e2c.syn_ele == TYPE_LFE ? "LFE" : "", + e2c.elem_id); +} + #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) { @@ -494,6 +510,11 @@ end_of_layout_definition: total_non_cc_elements = n = i; + av_log(NULL, AV_LOG_DEBUG, "Element order before reorder:\n"); + for (i = 0; i < n; i++) { + log_e2c(i, e2c_vec[i]); + } + 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 @@ -520,6 +541,11 @@ end_of_layout_definition: } + av_log(NULL, AV_LOG_DEBUG, "Element order after reorder:\n"); + for (i = 0; i < total_non_cc_elements; i++) { + log_e2c(i, e2c_vec[i]); + } + for (i = 0; i < total_non_cc_elements; i++) { layout_map[i][0] = e2c_vec[i].syn_ele; layout_map[i][1] = e2c_vec[i].elem_id;