From patchwork Wed Mar 13 23:09:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103320pzb; Wed, 13 Mar 2024 16:09:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUktO4KPxnw55K7KaG2Gx+Y2sUD4ciY3ySqCVCC0gHGDlNGD3T+zTE/7j3PQGKBnNH5UW/RYsfc0hKQ3H9CqAfRlY78RylfsJeHaQ== X-Google-Smtp-Source: AGHT+IFz7VQPCfOnGQ+p+dfNZjyMhf+GwB8sKIokzT1S24g43FyDaPY+DM3+0sYySSm1OF5PyNFM X-Received: by 2002:a05:6402:910:b0:568:9fe3:6ba4 with SMTP id g16-20020a056402091000b005689fe36ba4mr25262edz.42.1710371395421; Wed, 13 Mar 2024 16:09:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e12-20020a50a68c000000b0056871419d13si109741edc.172.2024.03.13.16.09.54; Wed, 13 Mar 2024 16:09:55 -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=@outlook.com header.s=selector1 header.b=BOd5B1FX; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18DFB68CF89; Thu, 14 Mar 2024 01:09:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2066.outbound.protection.outlook.com [40.92.90.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F19568CE1C for ; Thu, 14 Mar 2024 01:09:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q2HN20cBpCkv4zpaBZ3XajD4R3YM0kjkmH0jBpVQ8xOOw6uLQhmfS3X99PMD6YHRLp2kMyzC1rdAfLIxdCY4+HljmffnfAiymmurTPSzEQUjumpSKTagag2ZfBuupklRdy4v58tRla7zPmo33xk4xNpGvYDy8R3MDqnD6gC2E3SlIHc5MNADaldofEStqTbtY9YhL8h1ciNwFnudc5e8un5Pl4gl8et5Z+eiJnxAnfhEnmoGidnjTtJHfZk9ONUTVMq6YtrPDxMvGj900pbdhVErSG+2OKPxo9SJPEbFhQmHw0mIF1+lQNgG7ao7Y764v4yWST7VmsD4g9XXdKAhXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QnGfxm+di2IyZWoC9v8DD6KKq3d3VFrHxkMlz1BjGgI=; b=f3hoGN/ABxLUvDGGuR8fPHwqtANyhx/9RdUSitd+RI7M7AwHT8ESEcvCbbHA0A5JuJHu+HmqcSJ8F+gO1qLDee8QNehKzEzTvfWCo4PJO7k6dn1vxLTr23Kc2Fx/TPV0KCyEyQdNjFSjYB2+LL24MXxlkoF5ZBgBvphH8HahWxBSwO/gU+xKtx3tvaUV5PnzwTI67INJEl4KT2by3mQh9D25E4FP1o3mFFkNZejR7wSVQiAbOBHKwnCw7sFQX0qdUXlv7Sd79qPhGGnePmt37NXqzAiHJa4c4kaQZrCgA2rqnSwPDQGcrSabuAIimsXkUxBYb4+NvCw9zPGcfqykOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QnGfxm+di2IyZWoC9v8DD6KKq3d3VFrHxkMlz1BjGgI=; b=BOd5B1FXVN1n4a40YcKvPkTsQp8/pkmVCn3m7PHpdcvWknWoq2MUEo4Z/h0kPPB4bDl14ZFsPDxS3z2CgfhHp7SqKd/1qetCHRPw/Ojmbt2kyW0Jhar5oURVzjd31II8YQIwe4Rk+DSUAsXFCB2u6w874OQOnwxO/xcexizn7vMAqnVwp9E0x3O7Bcc3rRZ05ikL3fuK1u+434sERqUOT3QzbCvqm7PGnLAJa9VljhqCab3/3L0LNQORXxMctsdSuBVC4zLZFq7JXiUbR8XriHMlNHm0Fsm5bIiS6pxtOPZwmEs6pqi+t2vKC8Wkf9tcngSzdHcNPwXvvkWeEq03qA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:09:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:09:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:30 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [vadMRuV9YTnRsw59Gda4BwaH6AHMmB3+oE/qe7c83Es=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: 6887649f-69f2-44bc-71f0-08dc43b2ab0b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrZB07ndMjn8PPzEH1YHAJhg1+13hexcOc96AlBNw79tfBxngIFNC/f5DD9MdjVJk3QuafrQdN9hCBwyK5rNO2OeFbsaAjTTPTgX/QOIogbwYuaqnkzat+zQlu8tzdbGBySuakrpEieTpw6JF7s8BUvsi0O4wdWzhEIO33WdL50kickocxEyYkx0ELemggWzaGPuz8Bkunf5+1cG6SCuENKyecjwvk5F2BG0GEweapgll7KbdJIpw/aov/Aga+j4LYzh08oSD3POwpKcxASrgkC4eeA5ax3ZqTjPj+ppxZfnxJ3ho1uk4qFhVOGcYhj1nar9ktAxXcvNkQ2i/tf11Qmi72k7GDsMiPAPL9b5Wq/auR8Ipg3+WYUlc3BWCgUqMavFvYZXYTApnm3oQY+b70rKo49ek2bwVB2qMvrJD127+6akT37NyzeooLXo3Ggmacn6QPp6TDhijMl81NNMQ/UhdeM/B7LJ/OJ5vWd1rpXSCKSnUJ165MiJ9tiss3meDak2/CQ+WJLzM/p/7BzbLWIc6LgUWQoEJCugfvFYV3rmH5p/uFi2f968fv0L96ZcTp80Q62E3n0x6RgnSses0wN+Dz6dsexLEHKH9rfJYB/PPVZwSOM7zTNabd8aivhOymQTtIHQZf8T53nygghG016vcfKy/+4woABg6S68rsWLMoeFEvcxLJNhgHXObNip8BYg8wRtB0eY5bAnntrPHAuDyoDlmKT3bEE1hHtwvlEbq/W2D9slKWwUQ+CW/mXViA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J8uS6Ups5DDr7LYOHdJhnmDN8I7ZfVN0vkPMCAbI/B611Qfzi+hteM9kjnDBrbsgI0b0/600Fgu1YLP8L7GIi7hxaAtsnDqffn3DPGhw3fo+V2lBqYOWMTl4tmNO9g2nScqnmtBqoNAgyJEXdZttmAoJVPWS/0T2IsxGXoeFFCCFlnAk0YTjOGYnHJ4noUF89c7amm0QIzza0T/jhVjCFz2Ip0Zn5Qg/lNhOufpyD3oleV62Cv1VWJxcJI1zyqqPGDi4tUvvZ3Da39bNiMm40lnVYI2ldlxQ8H9CnBbHFAH3U5zbl6/dUVc1zOkLXEA19MWYsMOuYDLXYaaYAmY0A72uDoNp1VewksNFXUnMwOR2Gd3m+xNpXhhU+kR/OzQCoIeYH2jTVhuqc0EK5EcVmD9TrboMSv2tqU/DW+i2OjcaR/8+U6PKXUcHC05ncPJypyt81eFMRVU1/2nML6FW2ut+tNgROCQKAfrCH2Y+rZOiJxX4D8nWZfp9mSTEuyg9L3JAFhHcSoY+rOiBZDtB/ZXCnISTfq6HvMOZNcQTUsvswBCE0WvPuEbuszFryIsfUCKPIBrKLEKjwb+VTEkg42GOvOWcD/QSuP09E+unMnZuL+8F4pDApoZDtvA0PFK6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oB1F175AY9Q375ZxPdwLpS9UZOjpOZg7pIKx03jHFtBcjr+N37G8IpVojxZCzE+8yB1jA2YQjJjvsFxZ45i1cuygLYtuHOt38f69KhpmUhqVRTFh/Q1M4z2rSGQxdHwpQIJRLV393HO3hkZ/PAzTEGSzJXI4gVrzfomud76UxkXgsOZG8rfB4zZLD6yQ9uHfTBrjlWtAUEffl+AopumLweXieHaOvL8G3McTj8+vHIUD4Hc5pVuKal/a9klSJFP0QygIWkRypgyAQo5r0vOUC+Qi8DaeBJwGr/LwVsHVldpFCPFdPg1cjiqON+yjo8Q1UsXndImEyOObP5yhLnaiCuX1AmtuaDIMbRx5RQiCpbwzzDns7oJZjlB5ulRSJLFn9y4WOsxLKJxgGRrhKZBpz/2yrg40qmwDYvajBJD22crurhtLpJTtxxlcKgIm9zrkpAi3q2GDTqgc8zuq5HQJKVmpk+O4+GRXxCxJjzi4PxNUG35o8dYvbWkaI8Os8a1dKg3cSuTVQrjwGIg39+kGOS8ktM2vHzlUZBuPgriZZ78BxBxV2P+kHnD+l2Zprxk+I68k3LLiZhYsAs3vU6CmcetHsBirSq7lLvdEVsr8i0YTg2Kw3ZcYZ+VXKyLCDy/ztYX91yVDENEdBkhgmCtwfnkMD1sTwKZtwUt23heilb4nw5YamwaBldcSSKCIWISFUyXQXlZIGLob3zlX2y33Pn0yTcj/qN6OKURGIZnGNH4wi9a7cing8sXEZO+z/cPvbitr4bqIvV1cDNTCkiD5Er0Sm+V6yb7jXu+akbHovY3J4A1YgC8z6p6EqTHaFhEtWYLVQXj/nHbE87vcmCmZbqaJyZKfQXxGXOESI/5j7iCOfYMKF9zSdpa9E7MGbg/Vr55YJ16TiFsSbKAEUz83vb7j5yStlccug5vR2ZQnH+unJcgkPq1GOMKRikZIhpp4A7N6HwXl0SDXkgXR9PsuOmoKYZWBS2kPbTWpGE7FxRO88gFtkkrdNUwWfLjdawAayKr6YVvmKAjdW6zuqpYhJyNSRAxX9HTpCCBTXwOK6w1s4b3NHrG/7BAQQdUNGHDC/XUOBGYDt+ed+qkAr3fE/gQW+6FbbM3c7eH0fF2JbdkPCxe6ZwjV3nnXB0qC2Xp5UAJ7F/Czk9ynFUhyW6N+AiS8viQ3xsEz3a4mk3q1mdqLJRApMdlYlxDZgSq9TvOpAJkLnKcftO0Q5II3IFfKvxTFqB31Wy4i8vBoSv4tF3pT7LMQSy0mcG/TS/eXjELte0PyfC3pW5ZvKEbRLFQR8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6887649f-69f2-44bc-71f0-08dc43b2ab0b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:09:43.4854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/ac3tab: Remove enum CustomChannelMapLocation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: f+03Wxeie9gR Forgotten in 4c8d9b1d0901b0fba0887e53463574913e8862c5. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3tab.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 2531d80677..dcef643acb 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -45,22 +45,6 @@ extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; extern const uint8_t ff_ac3_bin_to_band_tab[253]; extern const uint64_t ff_eac3_custom_channel_map_locations[16][2]; - -/** Custom channel map locations bitmask - * Other channels described in documentation: - * Lc/Rc pair, Lrs/Rrs pair, Ts, Lsd/Rsd pair, - * Lw/Rw pair, Lvh/Rvh pair, Cvh, Reserved, LFE2 - */ -enum CustomChannelMapLocation{ - AC3_CHMAP_L= 1<<(15-0), - AC3_CHMAP_C= 1<<(15-1), - AC3_CHMAP_R= 1<<(15-2), - AC3_CHMAP_L_SUR= 1<<(15-3), - AC3_CHMAP_R_SUR = 1<<(15-4), - AC3_CHMAP_C_SUR= 1<<(15-7), - AC3_CHMAP_LFE = 1<<(15-15) -}; - #define COMMON_CHANNEL_MAP \ { { 0, 1, }, { 0, 1, 2, } },\ { { 0, }, { 0, 1, } },\