From patchwork Sat Aug 1 11:07:28 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: 21418 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 237D544930D for ; Sat, 1 Aug 2020 14:14:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0779768B948; Sat, 1 Aug 2020 14:14:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B3B468B937 for ; Sat, 1 Aug 2020 14:14:37 +0300 (EEST) Received: by mail-lj1-f171.google.com with SMTP id v9so458835ljk.6 for ; Sat, 01 Aug 2020 04:14:37 -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=kDT5i083SQ4lVm2h1jvGhywMPQYYnbUUzPQQ/j/Q9mOry7ZfqYDWBcLQqJ2pBAd9xt KRAahoiDHAY1uH+rDl1QNI+AlPzvimAer219BGmM8/tz2akppocJr5dSh4Lu4nrH2Fcu rAMX0oWjUL+jqVcWuFqxUvPgKmG43rLblcxXV8m64yJ3HRj2i6ivbgO4hxaQR8/HWRr9 y27EsEAgjUsuOj2trVqeeaM0I7iLuKgfAmWYfWfucni9L9zU7sHaGo6c3F8GXpgx0iYI qbluPSzlqLVF5ifgFilq6JLmylsneuN3t91OptmZHNj7cTaTGkFfFvk2lgmbDwhv7j5r TyJQ== 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=TrvEdOdmbWqtvFQWYKO8hCfZ7rGY5KZWgSSgfkSAkjp9nRJlxB8xTXfZlSOFFYbgEr mDSHD16kHMkoQHJB4Rzh0TI0Bze/t6gpysIt6xFNDy3D9H4w6lCid6rqO1iZIXaWbp7T 3LXjlX8a/PoeCwnEMWNJnaDZBYs7D/4AxjFVsta112Te5BE8bY/0gIvj6y91utVfYL5T GYYKNWd5UBkoBsPdZRNKhlQ/MA14d4cgrp7APAriMRmCG4STJhVPOCqrVR2f1+XE0QFu mo61/gQaBq6x3AJrHpwbeKz2iiPOo+RPSPJM4vsUOo/G3PTu/8hX6ZBo1vwvQXwvp2Yc 01bA== X-Gm-Message-State: AOAM532DSAXoux3OYe/0WJW+pcsU3/GKgKd/cgL+oZJbbe7CUv95Vab9 T73GKTMcSQ5WSkVz6xaMAU/4yAYn X-Google-Smtp-Source: ABdhPJwiJpGwJdeVYh3wknZNz1Iu6wb4Fb4/JYV49itBncroteHE40Wr/4CT9sDTv83OwkgerbV90g== X-Received: by 2002:a2e:8684:: with SMTP id l4mr3928623lji.75.1596280059210; Sat, 01 Aug 2020 04:07:39 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f24sm2694045ljc.99.2020.08.01.04.07.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 04:07:38 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 14:07:28 +0300 Message-Id: <20200801110730.30642-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200801110730.30642-1-jeebjp@gmail.com> References: <20200729113952.14574-1-jeebjp@gmail.com> <20200801110730.30642-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] 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, */ };