From patchwork Fri Feb 19 07:50:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25786 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 B5C53447D4B for ; Fri, 19 Feb 2021 09:50:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 923B468A2C6; Fri, 19 Feb 2021 09:50:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD3DD68A21C for ; Fri, 19 Feb 2021 09:50:51 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id u14so6620714wri.3 for ; Thu, 18 Feb 2021 23:50:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=uTfZj7hHoFhCtt4GM17fkjEDaK0P4C/4kmNg6CQalRk=; b=S16uvjwc7gTRrXeLhpxALHkjxItYU/quLxjHqBrNvsQwe+q5pZ3nj8iO3S/nDL8MTL roZ+yQh+/2/VNRMvZ9SzIHqPAr64wjqcoDair3iRKbTCAz6YdAKr10cz35Ly8sJYK7m6 XYOLgGwW3jOzfIHY9li2XJthJn3Lnd+Zz4otB52kdqSBZfZytiJXFZVPFQDHXkjP8Ym0 GJdymovxrQO/t3myX2mgB8FSrssSwMz2jrxvNKWgbrlE64Y3bFLRMBnbhwVXOelm9tLL ZojQIBiec6ZIW+3CX18bnQcbYHpwY5F1qHMKDJOoQymMF4YSA1PlbsbtFEqeWWXbA4bc ayrQ== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=uTfZj7hHoFhCtt4GM17fkjEDaK0P4C/4kmNg6CQalRk=; b=Z/1WMDaHX3NLvW69EchcuNR4ffcdqR8GP8nRMfs2lKnmE37INMYu6kzYxsJHtuAwJa LaZh9npfk6guWNUtwhBKxiUfCmKXU+qtkdo1ctvVCH9XGmULWwLOAdL0jtJtRM0qgZ8w rKIgCpeCr+p2mTLKvF8gc61gCkXAyzPtPzi5Zd9WzQXXM6LGBmK3NHorCx2jxcJhkkgt oOSBUg2HDg1pD8Ba3Y83I/mMD4G1vSgf6JfHN83qIukiJ2OiHZYMZPGCK8k4LFmvkzBw tr6eD+OMysp45kUtPytDeY/u3TcGxgBDTR2v1uRcGOmjiVJy8/dM/eGVPsjHPeh7rn+R 4pMw== X-Gm-Message-State: AOAM532D0qTBCjDrT+k2kG+1BpxYvnseh+zNASWisB/bxEPIXOVSWxXX rQ8ud+X+H0rtW3NeRox0Ky1z89B5Zow= X-Google-Smtp-Source: ABdhPJwGsGNfqfRpCaVnBjCKtOri/TrMZ+PZP0tzx4L3GhU72vqBq5a3byhmpITuuh51WnrpXoZM4g== X-Received: by 2002:adf:9564:: with SMTP id 91mr6432978wrs.207.1613721051233; Thu, 18 Feb 2021 23:50:51 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:09 +0100 Message-Id: <20210219075022.2445161-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/15] avcodec/ac3tab: Remove unused ff_eac3_default_chmap 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Added in 0c79b1402a48a99f32435a0f5ad2364c58c6fcf3 to use it a function that was never used and was itself removed in 676f1f533e2c2960d81784188592a066b9ff1c3d. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3tab.c | 13 ------------- libavcodec/ac3tab.h | 1 - 2 files changed, 14 deletions(-) diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 99307218cc..1dcaa0e977 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -263,19 +263,6 @@ const uint16_t ff_ac3_fast_gain_tab[8]= { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400, }; -/** - * Default channel map for a dependent substream defined by acmod - */ -const uint16_t ff_eac3_default_chmap[8] = { - AC3_CHMAP_L | AC3_CHMAP_R, // FIXME Ch1+Ch2 - AC3_CHMAP_C, - AC3_CHMAP_L | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR -}; const uint64_t ff_eac3_custom_channel_map_locations[16][2] = { { 1, AV_CH_FRONT_LEFT }, { 1, AV_CH_FRONT_CENTER }, diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index a0036a301b..081a5906fb 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -46,7 +46,6 @@ extern const uint16_t ff_ac3_slow_gain_tab[4]; extern const uint16_t ff_ac3_db_per_bit_tab[4]; extern const int16_t ff_ac3_floor_tab[8]; extern const uint16_t ff_ac3_fast_gain_tab[8]; -extern const uint16_t ff_eac3_default_chmap[8]; 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];