From patchwork Wed Jul 29 11:39:50 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: 21358 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 9018344B092 for ; Wed, 29 Jul 2020 14:45:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DDA068BA3C; Wed, 29 Jul 2020 14:45:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E68F968B97F for ; Wed, 29 Jul 2020 14:45:20 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id f7so21353200wrw.1 for ; Wed, 29 Jul 2020 04:45:20 -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=MPwjpnkh9oaCUNeq4za/dJgIemq9IpafXt3vfCfU7Fw=; b=LxwAbnFJdw2ZPf11pbksGnlhK+CBMIHQCDYxMMdkGfDSKjB/hXz2gy+5t4joHw4PR4 sXpoXbr8Aqq6dAVgaJsGP6UmdXwO9QWvnlH1m4HxB7ZkeV+UmFRxRL+d1fXLIUaMRY3E 6t7S1ctKMXcIzhcpMqXngYo08I05sbm2G3rNaAQkNDha7Pn8wEtQcF/BATXUsI78Ec9o QRoDgOgHNNZ4xceMmsRdMaRAnv9abBlcgZjZ8oM/Zj35TdAiEEwaEkfAFD4HC58xjT5q bKrxvSOVcKj8maIOGUju3AgjziKVxVCOOEV8B2cgPjOmSi4icsXjJ5KfNd4c1d13NeYe Wb6A== 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=MPwjpnkh9oaCUNeq4za/dJgIemq9IpafXt3vfCfU7Fw=; b=Mn+QNGdFCVYqXDg+QiXTVQgdyLxwJ0jYsuR42tDJEec/2lBpLhM9QCkIPNl1RkkYR/ 6EfoYaXKtw0RHRPicoAboZVfxqVQKY/OnW/i0Wy2HWwQWTkYARNhLyfGajxO1fibW4wh hSm+9AJ7ojVLZKpaKkzjPi7v+WIzXqiU6ZOunIfUo8zSWZkMvu1Br0+O+1EqIcEh/zQS hj2jT6YdbLSz5R4ryF4e8SHrea/6r07qyu47jOZzFGqK83T1YTSY3mkmzcTjzV+AkFLD Hyih3DoKfCe594WxqOjng2RYW8GKG8jqFarfacK2nZkLpN//o29d9jvH/2eajPE0dHWa bzOQ== X-Gm-Message-State: AOAM5328lzD0tam1Cjhh7dJZv/EeR9IdRBeCI62mwn3z7cDBN9aBkudM OZhAcrI4d1uVs9FRs9YZapIIGqpW X-Google-Smtp-Source: ABdhPJyknL+tU8QFz1wz3yVUxS3yxFXtxEqf7r/GaFCobqgo2R47gYuuzY7pSbqSihYi75VaY3c2mw== X-Received: by 2002:a2e:97cb:: with SMTP id m11mr14119151ljj.14.1596022796568; Wed, 29 Jul 2020 04:39:56 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id n3sm347003ljj.39.2020.07.29.04.39.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 04:39:55 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 14:39:50 +0300 Message-Id: <20200729113952.14574-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200729113952.14574-1-jeebjp@gmail.com> References: <20200616210253.7169-1-jeebjp@gmail.com> <20200729113952.14574-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/aacdectab: add mapping for 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" Utilizes the newly added 22.2 channel layout for channel_layout 13. --- libavcodec/aacdectab.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index baf51a74bf..c54a3eb943 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -35,9 +35,9 @@ #include -static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 4, 5, 0, 5, 0 }; +static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 4, 5, 16, 5, 0 }; -static const uint8_t aac_channel_layout_map[16][5][3] = { +static const uint8_t aac_channel_layout_map[16][16][3] = { { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, }, @@ -50,6 +50,24 @@ static const uint8_t aac_channel_layout_map[16][5][3] = { { { 0, } }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, }, { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_SIDE }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, }, + { + { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, // SCE1 = FC, + { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, // CPE1 = FLc and FRc, + { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, // CPE2 = FL and FR, + { TYPE_CPE, 2, AAC_CHANNEL_SIDE }, // CPE3 = SiL and SiR, + { TYPE_CPE, 3, AAC_CHANNEL_BACK }, // CPE4 = BL and BR, + { TYPE_SCE, 1, AAC_CHANNEL_BACK }, // SCE2 = BC, + { TYPE_LFE, 0, AAC_CHANNEL_LFE }, // LFE1 = LFE1, + { TYPE_LFE, 1, AAC_CHANNEL_LFE }, // LFE2 = LFE2, + { TYPE_SCE, 2, AAC_CHANNEL_FRONT }, // SCE3 = TpFC, + { TYPE_CPE, 4, AAC_CHANNEL_FRONT }, // CPE5 = TpFL and TpFR, + { TYPE_CPE, 5, AAC_CHANNEL_SIDE }, // CPE6 = TpSiL and TpSiR, + { TYPE_SCE, 3, AAC_CHANNEL_FRONT }, // SCE4 = TpC, + { TYPE_CPE, 6, AAC_CHANNEL_BACK }, // CPE7 = TpBL and TpBR, + { TYPE_SCE, 4, AAC_CHANNEL_BACK }, // SCE5 = TpBC, + { TYPE_SCE, 5, AAC_CHANNEL_FRONT }, // SCE6 = BtFC, + { TYPE_CPE, 7, AAC_CHANNEL_FRONT }, // CPE8 = BtFL and BtFR + }, { { 0, } }, /* TODO: Add 7+1 TOP configuration */ }; @@ -67,6 +85,7 @@ static const uint64_t aac_channel_layout[16] = { 0, AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_7POINT1, + AV_CH_LAYOUT_22POINT2, 0, /* AV_CH_LAYOUT_7POINT1_TOP, */ };