From patchwork Tue Aug 18 19:25:38 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: 21708 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 790D944BD02 for ; Tue, 18 Aug 2020 22:31:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B92C688084; Tue, 18 Aug 2020 22:31:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5928F680B6D for ; Tue, 18 Aug 2020 22:31:16 +0300 (EEST) Received: by mail-lj1-f170.google.com with SMTP id f26so22722116ljc.8 for ; Tue, 18 Aug 2020 12:31:16 -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=KNoigT4tofTDFSLT1kUTtQwQtNoYE4qcqeKKfkUm62I=; b=uQ82CEpm9sOiDlZVMeSmYOMTgwxqFBdLZiiFV/MJeseHM29LbyjdFmm+8TqZ1HWnq/ xhcxcEs6zgY+ckFohJSA+MYA/ve8Te6DBmlYXEqqsVt1RHcs8gpkh4MhZ/AI0/yrG33w CILEG2tjd9ynqwt/W/34tspn++C0ngUa2392jHNusq4el5qBB0bz0lG3+/u/m1dtiY55 wI7xZCTWAcqWLAO/lZF64crfnqyCcV4FPmyVYLJsDSZmHad2CdX8wS608yHYUNxiEm9U v2Bvz5YtCxMXEzJFXVtnZki1A8ek2dMjPHTSwzQPalFfCXxWCUiWeqdSC1ZLrqt0Ezzl kSig== 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=KNoigT4tofTDFSLT1kUTtQwQtNoYE4qcqeKKfkUm62I=; b=sIbZX3cSbjkV3Ovq6BGkYF+TFCtZzf/HlqTNUXbOy1UlbdBI8AzViVEXfNcD6LEWCQ nXWAUgESKatvDL/DIY44gFNMmp7EjgfqPzsHlGaeXhobXJiPjVGZJ/VfKXW8BPtvu8ON PTGIGrkfSgDx51J/7hFpWXe2RtjdSmmS+XYihndN1ytxFH2VTsnfwkm7CPJoe2HQ2uN5 kxX2tqJruB9H6cpowAX62qwbGtj5AxAxUMf0KubKjEHF4kJ62weKId4/VifC1V8J+CWm /JijHpAO7MD824Kf0WbkR+S1Z6kBxfqOuS+P8m5RWBzQYOqc0F5hzxl4Wt4Qc3Fa0feM DeUg== X-Gm-Message-State: AOAM532mBiN0XYztJgmnvL+d1Vv2yKJ6rjTdHW07qlq/tWjibObo0Bba Q3E9AaWY/sFueH/Xzc/W23B0+bKe4o8= X-Google-Smtp-Source: ABdhPJzl82rnFylW4hNfnTbESKRWZs2dZWyo5YF0p3UQ4LgyV7icaXdv/YRmeFg/VY/oHMhCjFeEdw== X-Received: by 2002:a19:e45:: with SMTP id 66mr10449613lfo.82.1597778743261; Tue, 18 Aug 2020 12:25:43 -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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 12:25:42 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Aug 2020 22:25:38 +0300 Message-Id: <20200818192538.35023-4-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 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 1e112ccf76..4662bbe41a 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -263,6 +263,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) { @@ -483,6 +499,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 && tags == 16 && total_non_cc_elements == 16) { // For 22.2 reorder the result as needed @@ -510,6 +531,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;