From patchwork Tue Aug 28 21:29:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 10166 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp8113064jap; Tue, 28 Aug 2018 14:38:02 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYCTDOfqegIhm3wPM2PODp37svMjEX+W3a6CGNlyb8j8PkwSlgAOF78t9iguCY/hPbERyWM X-Received: by 2002:a1c:d1c3:: with SMTP id i186-v6mr2501763wmg.5.1535492281829; Tue, 28 Aug 2018 14:38:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535492281; cv=none; d=google.com; s=arc-20160816; b=FP14xjtgxMkQ+4IdgePQJb71Lqwf8v6zZWeV3nU7o7rBrlPcxrG9TWzUMmFez2jvAo iVIZw7WoxgtuCRKQwsOoNAB4eURXA4gA7VHx4ZOz1LXi/8qCdsBoRoyDLjm25Q22HSyU Ubgf4LFVvakTDjZiTs57zvUyA95A4glSZWS1AxCin8665Nf0SZSmkUHPMOEdAovgnXVN cqJ6DFj8MECgmPGGLGV6YXQ4U3zqZg2O7CV1ZXIb9/z5pkLbU4gwMXQsY5WKs/QSnu0l kFgD/QtNtU1Bm3iTdxgdNMcPhsxAJMjVpsDTwcD9QaQ/LP5Z9iN4fzAPjJmHyTwkM37M oUUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=5L/VDJ6QDrJhxUTy15n9S6QerDPyq0uVBB/HWF+WBuY=; b=lJ7M2Lragc6Tiw0okEeHZ7dilfkLychplLwIsaORsD6vhCP1eZf7ALj/yxP4/cRq4w 5uNSOLC0yPxvqWWXyjX3DzKzmPHXaBh+iY0D3GvfboBlTIKeayivIsyv/AGCy8NJmaFL qU0L5x+zw9LRxLKY8CcBCSqHsWv6l9JdFHJJVkOBzI3uCYGF7G6Qaiyj5h1/DFv3Hc7r VSoKMERyO46PpTKUiq2vFho+lah5Pas79L/3VlTb5cN/Cxq14LH/pPHhL00BUAb09+sq RQDfA8CKcInkxLvLpBMGzSk2H6MY8BJ7fme5evNh/pdVtwysOF+nyt/6lOCK5JFmOy+q RLDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g19poHaF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o84-v6si1838219wmo.206.2018.08.28.14.38.01; Tue, 28 Aug 2018 14:38:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g19poHaF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9B18689E6D; Wed, 29 Aug 2018 00:37:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53888689C78 for ; Wed, 29 Aug 2018 00:37:49 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id m199-v6so2891242wma.1 for ; Tue, 28 Aug 2018 14:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/EUhWldL08mMcninv6wKntVEla3VdnYUQoObvFxApkE=; b=g19poHaF4dnqSTQ4vV4xBAYmyUUEMiudPBM/1Rnop3tZYEfYohWojwOJZeygzIpFSr PPCSTNGKlSJMjW+Dwl0lBF5TxOyvMOy4yfLMXTVqmgYd5/WVoAnGotHr7AKNoyUibaSB 2hMLETiDdXpzUoTeYuN+d/iruCrP6ZrBYPbPe79vIlxYoQT8mBtcq7ILQkkT3ds76gae LWqyLCPSZVbj+zjoU7DJhy0XScyDPLKX7Daovtb/Lr2h5B8iIKFPyKEVyGDIlLXPAmTR P0fqnQWtFfZTAgy7Lb9iwVfnHeQ+/Ya+ck5/fgvvmgCJVZ4mEw8dS6Zx/diTflnqVIts 4wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/EUhWldL08mMcninv6wKntVEla3VdnYUQoObvFxApkE=; b=sGEA8P2vBgPmFGMPMNy2pxfVQhF39KKq34rs8FN+mnCD0sYSzOgcz1eX9xWXSRRjBJ z6Ti/jkRHuwcEjrveSj+Iv0yqaCYI+0qiSs6IC7ewaQluAhl90t4xcZAw+4a1Ytu37vZ CE2CEpjH19mtIgyhaDF9v1gVPWU1gJu/+5FEQA+CJib6HbQGC/iTftX9nTx3iMPKwS8e Q2hy23+FvA+Fita/mQ+MAvPSbs1v5rjEa6R1lczwnIIF+XVAaW8GFnk6wr4BLtJa2Sqj yDfs7yQZw8x1ot2EjYHygYEQbA47O5/THfltvtTIOITD31gBAh6x/klQXx93I1KltlAN Pscg== X-Gm-Message-State: APzg51BMXiQOA1AzGQ2EGDPPcQE4VnWZ9EOIA4kJcHnwaY0z/bS608Xo dUgbUGoBRbp7Y6Y31I9uB97Ds9F5 X-Received: by 2002:a1c:8c49:: with SMTP id o70-v6mr2334589wmd.11.1535491780776; Tue, 28 Aug 2018 14:29:40 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c91:2d00:4d30:2840:9334:bc74]) by smtp.gmail.com with ESMTPSA id e7-v6sm1267000wru.46.2018.08.28.14.29.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 14:29:39 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Aug 2018 22:29:37 +0100 Message-Id: <20180828212937.30039-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] aacenc: remove unsupported PCE mappings 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Turns out those ones make the decoder unable to accurately determine the layout, hence making some API users' guess, and sometimes those are correct (ffmpeg.c), but most often (especially with side channels) they're wrong. The removed ones need to be investigated into as to why the decoder rejects them. Signed-off-by: Rostislav Pehlivanov --- libavcodec/aacenc.h | 177 -------------------------------------------- 1 file changed, 177 deletions(-) diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 5a015ca92e..74f8fcf43a 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -167,38 +167,6 @@ static const AACPCEInfo aac_pce_configs[] = { .config_map = { 2, TYPE_CPE, TYPE_SCE }, .reorder_map = { 0, 1, 2 }, }, - { - .layout = AV_CH_LAYOUT_SURROUND, - .num_ele = { 2, 0, 0, 0 }, - .pairing = { { 1, 0 }, }, - .index = { { 0, 0 }, }, - .config_map = { 2, TYPE_CPE, TYPE_SCE, }, - .reorder_map = { 0, 1, 2 }, - }, - { - .layout = AV_CH_LAYOUT_3POINT1, - .num_ele = { 2, 0, 0, 1 }, - .pairing = { { 1, 0 }, }, - .index = { { 0, 0 }, { 0 }, { 0 }, { 0 }, }, - .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_LFE }, - .reorder_map = { 0, 1, 2, 3 }, - }, - { - .layout = AV_CH_LAYOUT_4POINT0, - .num_ele = { 2, 0, 1, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 0 }, }, - .index = { { 0, 0 }, { 0 }, { 1 } }, - .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3 }, - }, - { - .layout = AV_CH_LAYOUT_4POINT1, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 0 }, }, - .index = { { 0, 0 }, { 1 }, { 2 }, { 0 } }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4 }, - }, { .layout = AV_CH_LAYOUT_2_2, .num_ele = { 1, 1, 0, 0 }, @@ -215,46 +183,6 @@ static const AACPCEInfo aac_pce_configs[] = { .config_map = { 2, TYPE_CPE, TYPE_CPE }, .reorder_map = { 0, 1, 2, 3 }, }, - { - .layout = AV_CH_LAYOUT_5POINT0, - .num_ele = { 2, 1, 0, 0 }, - .pairing = { { 1, 0 }, { 1 }, }, - .index = { { 0, 0 }, { 1 } }, - .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4 }, - }, - { - .layout = AV_CH_LAYOUT_5POINT1, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1 }, }, - .index = { { 0, 0 }, { 1 }, { 1 } }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5 }, - }, - { - .layout = AV_CH_LAYOUT_5POINT0_BACK, - .num_ele = { 2, 0, 1, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1 } }, - .index = { { 0, 0 }, { 0 }, { 1 } }, - .config_map = { 3, TYPE_CPE, TYPE_SCE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4 }, - }, - { - .layout = AV_CH_LAYOUT_5POINT1_BACK, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1 }, }, - .index = { { 0, 0 }, { 1 }, { 1 } }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5 }, - }, - { - .layout = AV_CH_LAYOUT_6POINT0, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 1 }, { 0 }, }, - .index = { { 0, 0 }, { 1 }, { 1 } }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5 }, - }, { .layout = AV_CH_LAYOUT_6POINT0_FRONT, .num_ele = { 2, 1, 0, 0 }, @@ -263,111 +191,6 @@ static const AACPCEInfo aac_pce_configs[] = { .config_map = { 3, TYPE_CPE, TYPE_CPE, TYPE_CPE, }, .reorder_map = { 0, 1, 2, 3, 4, 5 }, }, - { - .layout = AV_CH_LAYOUT_HEXAGONAL, - .num_ele = { 2, 0, 2, 0 }, - .pairing = { { 1, 0 },{ 0 },{ 1, 0 }, }, - .index = { { 0, 0 },{ 0 },{ 1, 1 } }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, }, - .reorder_map = { 0, 1, 2, 3, 4, 5 }, - }, - { - .layout = AV_CH_LAYOUT_6POINT1, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 },{ 0 },{ 1, 0 }, }, - .index = { { 0, 0 },{ 1 },{ 1, 2 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6 }, - }, - { - .layout = AV_CH_LAYOUT_6POINT1_BACK, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1, 0 }, }, - .index = { { 0, 0 }, { 1 }, { 1, 2 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6 }, - }, - { - .layout = AV_CH_LAYOUT_6POINT1_FRONT, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1, 0 }, }, - .index = { { 0, 0 }, { 1 }, { 1, 2 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6 }, - }, - { - .layout = AV_CH_LAYOUT_7POINT0, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 1 }, { 1 }, }, - .index = { { 0, 0 }, { 1 }, { 2 }, }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6 }, - }, - { - .layout = AV_CH_LAYOUT_7POINT0_FRONT, - .num_ele = { 2, 1, 1, 0 }, - .pairing = { { 1, 0 }, { 1 }, { 1 }, }, - .index = { { 0, 0 }, { 1 }, { 2 }, }, - .config_map = { 4, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6 }, - }, - { - .layout = AV_CH_LAYOUT_7POINT1, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1, 1 }, }, - .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, - }, - { - .layout = AV_CH_LAYOUT_7POINT1_WIDE, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 0 },{ 1, 1 }, }, - .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, - }, - { - .layout = AV_CH_LAYOUT_7POINT1_WIDE_BACK, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 0 }, { 1, 1 }, }, - .index = { { 0, 0 }, { 1 }, { 1, 2 }, { 0 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_SCE, TYPE_CPE, TYPE_CPE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, - }, - { - .layout = AV_CH_LAYOUT_OCTAGONAL, - .num_ele = { 2, 1, 2, 0 }, - .pairing = { { 1, 0 }, { 1 }, { 1, 0 }, }, - .index = { { 0, 0 }, { 1 }, { 2, 1 } }, - .config_map = { 5, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7 }, - }, - { /* Meant for order 2/mixed ambisonics */ - .layout = AV_CH_LAYOUT_OCTAGONAL | AV_CH_TOP_CENTER, - .num_ele = { 2, 2, 2, 0 }, - .pairing = { { 1, 0 }, { 1, 0 }, { 1, 0 }, }, - .index = { { 0, 0 }, { 1, 1 }, { 2, 2 } }, - .config_map = { 6, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, - }, - { /* Meant for order 2/mixed ambisonics */ - .layout = AV_CH_LAYOUT_6POINT0_FRONT | AV_CH_BACK_CENTER | - AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT | AV_CH_TOP_CENTER, - .num_ele = { 2, 2, 2, 0 }, - .pairing = { { 1, 1 }, { 1, 0 }, { 1, 0 }, }, - .index = { { 0, 1 }, { 2, 0 }, { 3, 1 } }, - .config_map = { 6, TYPE_CPE, TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, - }, - { - .layout = AV_CH_LAYOUT_HEXADECAGONAL, - .num_ele = { 4, 2, 4, 0 }, - .pairing = { { 1, 0, 1, 0 }, { 1, 1 }, { 1, 0, 1, 0 }, }, - .index = { { 0, 0, 1, 1 }, { 2, 3 }, { 4, 2, 5, 3 } }, - .config_map = { 10, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_CPE, TYPE_SCE }, - .reorder_map = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, - }, }; /**