From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3C3D1485B8 for ; Mon, 19 May 2025 13:03:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8074468D374; Mon, 19 May 2025 16:03:19 +0300 (EEST) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2080.outbound.protection.outlook.com [40.92.48.80]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CE1F368D105 for ; Mon, 19 May 2025 16:03:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HQ3fcoRAKp+r7/tD2Q0xzH99DSZohGrBHNmdI9XRSCOTLOkIh+nFX6RjXtGhpXxiRiGfKv6NTyzOcWqFnSZCY2OATNmlI4DmUSG2Go7rDiNjzLs86mnhn7WVSdCZEjXi9DgUCS8wjHGbF73zYZ86LdH4jl2/I2CQuN6YfZciPceT0rmn4nZcCTgPbSJ6XmX25gZ7GVA4VHHT5IyV9X+dKg4kJRd9JeToGICwz3bcFHKxXctPtfA9Ck79ZXL3fHzaOZ1BQiB346XfX4mIvJ5I+QSjo87OcX+xn0hU+9T3MOXPyP9X1Jt9ctGW+VJAP3Eu8bugWu4k9lEPWxEGa7xs8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=50M/mq2i1QKhvLDSBmdoDJS/vyGSkZJNp2wsv1iUZMU=; b=MVWXGkvHJ3ggUdGYc6tJ7hoJM0uXk8qbUXeT5WSQXrsmR0SUXikeg4O3SLdUkqM3qK3Qc3FNs7y4N+oD26QI52OEMDaySv/1TKTnT8AksucBcZg5D9WmR8XnI1CKfHZyEoFo2BxYidkMwcQ4tNl648b8yhbpOctWF6r8mnFBNTFFCxsTsp/DBWMs0seOMKdsbtHtoClovFkx2JDxk/7Ft0G56K1EfWw71EkCpIwdniXaXx9zsQYR7bmoDLXsQ2Iy5gNZEI0wbO+xs7IHH3yxeDzweXhKctxqjYr7fIVYY9+kcTOh4uxJIeH1t0B7kObtvYcMKwNppJ5pbmbg0oiJ4Q== 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=50M/mq2i1QKhvLDSBmdoDJS/vyGSkZJNp2wsv1iUZMU=; b=Eyl+t1dsMyYdoqPeTChj0H6c3cTvep0I13xBViih/MexMRWPwEnT9AeAfJHgcxmP37bcVKAbmgmVGhMicet2dVRdcBW7xzxxOJtstrYGDwuTwUjL3aQdbrOFMxdy3E0niOsuRHdpXlMm00LN1p5sKuD9NYr8wGyi7Ln6xTjfeHHAyYdSo83Hck4Cu/2f2UNL9n/ti6P9vpZSKQAeTxbrhGOhbBF4f0NYFYCbIv9PCQ8wRUe4PHM8mboSmNcAz7QX2fJ0QiTKfqoVTC7CllV7yqL4t2+E6/e6Tb3SGEl0ALbcTO0Uf/5vGcu+x4Yegk9eNem1rKT79o0vEAw4OkV6Mw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0193.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Mon, 19 May 2025 13:03:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.8722.027; Mon, 19 May 2025 13:03:11 +0000 Message-ID: Date: Mon, 19 May 2025 15:03:10 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250519121537.509658-1-chenyu202107@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250519121537.509658-1-chenyu202107@gmail.com> X-ClientProxiedBy: FR4P281CA0051.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cc::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <2c796315-718f-4582-9a3c-0b255e8d748e@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0193:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f94811e-1e42-44ca-610c-08dd96d581eb X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoaApi1aWVt9ILKZbGoHsd6oAJICz5P7XV3N8rUMOLMisxedwTez8etr6tv/gmeoA3CyQccK9kbk+UuG1u348j2o+uwRt0Cv8/GRlZcgupWCGq0ggHFDb9nnkcbRc2y2UD8CAgzwA+EnsTMh6xJBxKogAU4Y7O/bOSJrh2qMXcaWn/9lPUrC59bCQcjeUMDjfXehM+td9+TTjIbpyOEhabpGRiBLE/wBseF3NA3tbBCIjQpqH3siau0ME0Q+0Cc3j0Y7ueggdzVEI4SBKL7i+De//kssLH5FLM8vBGH42KeNYIUysf4yB86NDosa786N1MaDEEKML1LWXneNUEJGyQwVPpV4HBsXcBaD8WW8vCWm4pPvHKzssl5OxT/UJwg/2EVsnsGUSFMFoVDpUdIOlY1oHB8d1bdCw+X5Xa2itbhBcq+VwPbvrH7pAimXAe/o8eCCzJDXoHyF+8AtoxFbiP2PKaTLG1PNIq/yRzoRSXMLxlY9qRSRssTbnMyBV3A+cugztib1YCK2fRS0K17s2br0YR6JQXcnp55jDcZnJypadcLQT6QMqhansCHGbob6GDToKxe7zkbAXu8VckLsQrdUMTCNeDBvDa2xIGv8sq8UsC3clksDpE6bmohDUYj11g8NpQZLK0olrJuR8yO/tPeoXZyPc2bZaIr0avxsmdfoexvUpW4fZM1zxKRBR5zLWgb8p6W0YyftOVvQKeHcsMaYqya+wAvzu0COxlRCGNKiJP7oKkJC+PJzlxS+1S1m1g= X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|6090799003|41001999006|5072599009|8060799009|15080799009|7092599006|19110799006|440099028|3412199025; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dXJHbVdLZlh4aDl5RzYvM0o0dHVRYy93TnN2V1ZIUmhqOThuUVN3Qjd0Z3R1?= =?utf-8?B?NWQyd29qTU1LWVZZTU1BdzNqeUNJS0kzNHBRbXhRYks5OVk4bXRjc2VmNnNn?= =?utf-8?B?b2cyekJJVTVncWRHRC95cGFWR1BaNG1wS0ZoNEVocVhnNXc4T04ydkF6YXZq?= =?utf-8?B?SlBVRlFhQytrRHpibjJ0SHZtK3k2Z01ZeEhucU4reHIzSXN5eUJSYUh0YnVL?= =?utf-8?B?WVNYbnpZWHBMY1ZyMlVEWnAveDJtTnNqdUIyYUdBcWxpWjEvSjZVMXJvTEpX?= =?utf-8?B?dTRlbFpNUGwwTy9xc3YvVWlqTXJod2MxVmdTTTJJR2o4RlpxZUlLOVdRL3p4?= =?utf-8?B?NC9SSzQvdmIwdjd1Zms3RmNNNTEyK2lqVVUyZ2hQZXRwYnh5YXp5TktuWVFP?= =?utf-8?B?SmxsdzFCekMydWEzOUFKcmxLaGs2SnVJTGQ1SXFxTDh1YmJuMjJyc3JxVWtN?= =?utf-8?B?WmZTOGhXbTd1WjJFMDFZUzdNbi8vNlFhOHVGRTc5ei9ENzRldnRMa3JtR3RR?= =?utf-8?B?VkxCMXB3Z09ack1wVElycWxoSGpXUHBuVWxLSk45RTF1ekY0cmYzL29pbjZW?= =?utf-8?B?NDNUenBTVHNHVVF5V2NyKzB0MXl0aWxnVU9vdnlhVmsvbDBYVHR5RTBhamx2?= =?utf-8?B?cy94K09FekNRV2ZWZjFUV2VUNGFKVUUxZ0NZUitGd1ptajV3L01WT1lwQmpx?= =?utf-8?B?TWlvTFY2b0duNVVOK0lxQkJFR1p2bGw3a0xIS1ZTNWlocW5NL0RSM3RtQy9R?= =?utf-8?B?Z0VhdWtSRDNPRmw1UEkzMDJRZS9WWmk0WjZMa294bmF2bG9qaUEwdldyVnUy?= =?utf-8?B?aFpueStGK2pNQU02bmtWczNqWkFYQXNnWnVXZ2FFK0tLNkRTbXQ0VlMrYkpJ?= =?utf-8?B?cHl6Tmg2MlIvczBKQ2M1MVBCY0svREVCeWExTGNNVnEvd3VscjJyc2FMdlNX?= =?utf-8?B?MUZJczFwNDNUUVVXT1d1SXIwMTRqNkVJaUZCUnhCS2ZvMnoxZjRpM0IwaGxl?= =?utf-8?B?VlorYjc0WWRNNWR0VENTaHkxQmVHNkNJRU1ldldqR2xHTnBNa2JwenFXcXJB?= =?utf-8?B?ZUFudXdLTXlsaHhCSEtPcVJtSk5COEtEZUtOMnZCTVFzZ3NNYkdwQVUycWZW?= =?utf-8?B?VkgyWnN4d3ZSc3ZJcXJXL2pDd3U3VGRtV2NQVlVYZXRmSWw1TjBZSHpqaDY1?= =?utf-8?B?OEMya0tjQlVRaG1qcGxxcmxwN052UTFuWk5zclZaeG8zQ0Y2Uy91WEZ1dTY3?= =?utf-8?B?aTBsMDIzT3lnL1dqWjF6MXJsdC9NbHBVQVJTZXlBOThvKzVSbi80clI3Mjk5?= =?utf-8?B?akdTVkNoeWE0a3NiUm5aVlV4N3MwQzN0ZG5pNFpLWnNJZm5Rc1pGRzF6NWIv?= =?utf-8?B?Y0wyb0M4bEpvamhRbEZsaW90NHNGeE56VU5lZTBhUkM3NnNydkpjK05uRlhB?= =?utf-8?B?ZGc0UUFYRmpkTmtIQWFuaEFkOG52MmIvM3o0ekM3N1ZPNlJnN0JLWDdXZW05?= =?utf-8?B?M1JvWktCdDFUYmtIakdPcHkxdUoxQlRYNHVnNXZ5ZlZkQjdIQTgxU3hLUW1F?= =?utf-8?Q?q7/gXioAnef+vSXs8/+vg/D6g=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WGE5dXVJUHJOa0V1UEpkVENJZHUrelZNUERlZXZtNERQOUx6TkpBSmNab0Rh?= =?utf-8?B?V0R4MTlaTUdTSlhRRHlUUCtDVWR0SkptR0RoTGZGak44U2ZFRkkwVjFUSUlo?= =?utf-8?B?SXE0aDc2MG04T1l3OExCeHN4T3Y1c01lTGFyUmJqanRSZkx4UWRkK25idERk?= =?utf-8?B?V1owYnNFSkZpZjRQaWM0bEt3d3duRjF6TEpDSkRaTUtrakx4U21qTm5sdEJH?= =?utf-8?B?N09CNnQwbWhqR0lpUGM5UmIzZldhNVJ2Y2tOb2ZyRVA4aG5Ta3FRN2c4cXFI?= =?utf-8?B?eFU4VWNzQTdBMXFEeFpoU3VZcjA0MndWRkE4bnVuVXA1TnYxaXg5N3locDBB?= =?utf-8?B?ZE91WDZFdE02Q291bUF5K2JlcXp1eTVOay81bkNqUzUyUFJCQmdDbysrNVBi?= =?utf-8?B?QXpESXU4ZWxQSkxKYTE0a1RFMlVYdGRFV0VHeS9aSU4ybVA1NG5UQi9kQnFw?= =?utf-8?B?amxQdEZobG51QkRYZmtiUnd3Sk1yMmh1NlBpdXM0R2VTcWlySW1UQzF5d2xz?= =?utf-8?B?MFlST2F2RmQxZFluWjAvWFE4RVAwakhDY3ZTRFM4R3FkQkdoV3dwRW1YcHlM?= =?utf-8?B?UDg2M0sxSGVHNUtwa3p1NWxhdk1LYm9TVnN1c0lFTE84azhsY2tQNGJLeUdG?= =?utf-8?B?eVo0cldUSzI3Z3BLYk5SQlNzY2ppS09tYk9RMUlzWjFpeWprK0FmTm9HUFhq?= =?utf-8?B?K2dmVTJOWTV6WmlWVFZGOXNCZDZuZFNGVVZWanNwNHNoWGU2OHoyVjI1V29Z?= =?utf-8?B?djVQTGc5UXcvdldFL3dMSUE3aEdDMUFQaTZsMGMwNmFncG4zYWdiNFgwVmlJ?= =?utf-8?B?enNVbzJKVWc3aG1ZcXRrTzEyMTF2U0VtK09QNElSQnZKZkI1THJKTk1hMXpx?= =?utf-8?B?RXhHaDJYRWpRVTAwd3dsRjUxVmtLWkRZQVJuVkd2ZGx2OFJjajhaWmFXeUpm?= =?utf-8?B?VVoxOC9TQ2dNbmRuVDltb0x0eldYMWs1SEJkd0FvTy9qS1hxaWVNYlFmMW5a?= =?utf-8?B?MERRMTRaMUN0M1VWZURSS00reDdRZGZqRDJPU09Ob0dVRzlwcnRoL2o2L1Y5?= =?utf-8?B?WmhUSmtHaWptUzV1YmJ3czFlRUVmRy93QklvMHgzaTRCd3dWR3YwaWtidUlK?= =?utf-8?B?NnI2RDZpMEpNaFdWeE82R1pKWFJyUmJXczVpandNWlZDb0dJdEZZM051QUJZ?= =?utf-8?B?RVJQZDROd0NUbUl6R3hYa2Z2NWQ5NEFLQVM0QnM4MUZmMXNsS2twcnBDanl0?= =?utf-8?B?RmgyWFJFUTd2L2Qwbnh5bHByY0VoVGdRQ0VUOFYxU3hnVEdtUUZ1QUh6OWtY?= =?utf-8?B?cUQ5M3dNeVV1Zks1Y1Y2NC9wc0prV1RkZHFFVkdmVlpxVnloQkV6TGsxMzly?= =?utf-8?B?Q2hWNWdDalRMNmhkTkFGaHA4c1d5YXdsaG50UnJ1dnYrcFRiNVVaUWc2NTh0?= =?utf-8?B?ODRwRkVsVzNtUEREb1VqZk54YjZNT3VRZDJ0THRHVkFtQ3ZCYUROQllUNDhT?= =?utf-8?B?Z29lRTRQTVl4QnhoeTNYTHhVTTgyL2hFdldHKzMyNjU5dXIxYmhIZjZHL3M5?= =?utf-8?B?MVRwMXNULzZmRm9CVTlqakF6R3QxRVhsLzQrcUVGOFJxK21vR3Vpa3ZlVXV0?= =?utf-8?B?MDNvWTVDR0krVjR4dEtuOU1QNyt0MFBxUG5wV1c4VDB1L1pGRzF2N2QzcnBL?= =?utf-8?B?bndyT01HRDJkQ1JYS1AwWFVNeTV2U3JKY1RNL3IzaHNmUjJKR0dHemFUUm9B?= =?utf-8?B?VmFHaDQvSVU5enF3NE5WWTU3aTZjakxsUUtrZnhpOXFWaVFuZHIxQUhHUlQz?= =?utf-8?B?aFl4T1JucWU0RWNoR24rdz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f94811e-1e42-44ca-610c-08dd96d581eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2025 13:03:11.3224 (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: PR3P250MB0193 Subject: Re: [FFmpeg-devel] [PATCH 1/1] avcodec/pcm: reduce code size 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: chenyu202107@gmail.com: > From: chenyu > > add depends to pcm.c for reducing size when ALAW/MULAW/VIDC not defined > > Signed-off-by: chenyu > --- > libavcodec/pcm.c | 36 +++++++++++++++++++++++++++++++----- > libavcodec/pcm_tablegen.h | 22 ++++++++++++++++++++++ > 2 files changed, 53 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c > index bff61f2195..60a2c544a8 100644 > --- a/libavcodec/pcm.c > +++ b/libavcodec/pcm.c > @@ -44,15 +44,20 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) > #if !CONFIG_HARDCODED_TABLES > switch (avctx->codec->id) { > #define INIT_ONCE(id, name) \ > - case AV_CODEC_ID_PCM_ ## id: \ > - if (CONFIG_PCM_ ## id ## _ENCODER) { \ > + case AV_CODEC_ID_PCM_ ## id: { \ > static AVOnce init_static_once = AV_ONCE_INIT; \ > ff_thread_once(&init_static_once, pcm_ ## name ## _tableinit); \ > - } \ > - break > + break; \ > + } > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > INIT_ONCE(ALAW, alaw); > +#endif > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > INIT_ONCE(MULAW, ulaw); > +#endif > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > INIT_ONCE(VIDC, vidc); > +#endif The macro already checks whether the relevant encoder is enabled; your code meanwhile enables the code when the encoder or the decoder is enabled, although only the encoders will ever use this. > default: > break; > } > @@ -216,24 +221,30 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, > bytestream_put_buffer(&dst, src, n * sample_size); > } > break; > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > case AV_CODEC_ID_PCM_ALAW: > for (; n > 0; n--) { > v = *samples++; > *dst++ = linear_to_alaw[(v + 32768) >> 2]; > } > break; > +#endif > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > case AV_CODEC_ID_PCM_MULAW: > for (; n > 0; n--) { > v = *samples++; > *dst++ = linear_to_ulaw[(v + 32768) >> 2]; > } > break; > +#endif > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > case AV_CODEC_ID_PCM_VIDC: > for (; n > 0; n--) { > v = *samples++; > *dst++ = linear_to_vidc[(v + 32768) >> 2]; > } > break; > +#endif > default: > return -1; > } > @@ -327,20 +338,25 @@ static av_cold av_unused int pcm_lut_decode_init(AVCodecContext *avctx) > PCMLUTDecode *s = avctx->priv_data; > > switch (avctx->codec_id) { > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > case AV_CODEC_ID_PCM_ALAW: > for (int i = 0; i < 256; i++) > s->table[i] = alaw2linear(i); > break; > +#endif > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > case AV_CODEC_ID_PCM_MULAW: > for (int i = 0; i < 256; i++) > s->table[i] = ulaw2linear(i); > break; > +#endif > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > case AV_CODEC_ID_PCM_VIDC: > for (int i = 0; i < 256; i++) > s->table[i] = vidc2linear(i); > break; > } > - > +#endif The encoder checks here are wrong; and the placement of the last endif is wrong, too. > avctx->sample_fmt = AV_SAMPLE_FMT_S16; > s->base.sample_size = 1; > > @@ -545,6 +561,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, > bytestream_get_buffer(&src, samples, n * sample_size); > } > break; > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ > + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ > + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER This should not check for the encoders at all, because this is in the decoder. > case AV_CODEC_ID_PCM_ALAW: > case AV_CODEC_ID_PCM_MULAW: > case AV_CODEC_ID_PCM_VIDC: { > @@ -555,6 +574,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, > *samples_16++ = lut[*src++]; > break; > } > +#endif > case AV_CODEC_ID_PCM_LXF: > { > int i; > @@ -655,7 +675,9 @@ const FFCodec ff_ ## name_ ## _decoder = { \ > * to the table in pcm_decode_init() as well. */ > // AV_CODEC_ID_* pcm_* name > // AV_SAMPLE_FMT_* long name DecodeContext decode init func > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > PCM_CODEC_EXT(ALAW, S16, alaw, "PCM A-law / G.711 A-law", PCMLUTDecode, pcm_lut_decode_init); > +#endif These macros already contain implicit checks to ensure that only the FFCodecs for actually enabled codecs are included in the binary. > PCM_DEC_EXT (F16LE, FLT, f16le, "PCM 16.8 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); > PCM_DEC_EXT (F24LE, FLT, f24le, "PCM 24.0 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); > PCM_CODEC (F32BE, FLT, f32be, "PCM 32-bit floating point big-endian"); > @@ -663,7 +685,9 @@ PCM_CODEC (F32LE, FLT, f32le, "PCM 32-bit floating point little > PCM_CODEC (F64BE, DBL, f64be, "PCM 64-bit floating point big-endian"); > PCM_CODEC (F64LE, DBL, f64le, "PCM 64-bit floating point little-endian"); > PCM_DECODER (LXF, S32P,lxf, "PCM signed 20-bit little-endian planar"); > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > PCM_CODEC_EXT(MULAW, S16, mulaw, "PCM mu-law / G.711 mu-law", PCMLUTDecode, pcm_lut_decode_init); > +#endif > PCM_CODEC (S8, U8, s8, "PCM signed 8-bit"); > PCM_CODEC (S8_PLANAR, U8P, s8_planar, "PCM signed 8-bit planar"); > PCM_CODEC (S16BE, S16, s16be, "PCM signed 16-bit big-endian"); > @@ -686,5 +710,7 @@ PCM_CODEC (U32BE, S32, u32be, "PCM unsigned 32-bit big-endian") > PCM_CODEC (U32LE, S32, u32le, "PCM unsigned 32-bit little-endian"); > PCM_CODEC (S64BE, S64, s64be, "PCM signed 64-bit big-endian"); > PCM_CODEC (S64LE, S64, s64le, "PCM signed 64-bit little-endian"); > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > PCM_CODEC_EXT(VIDC, S16, vidc, "PCM Archimedes VIDC", PCMLUTDecode, pcm_lut_decode_init); > +#endif > PCM_DECODER (SGA, U8, sga, "PCM SGA"); > diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h > index 7274c3cd17..590ba59814 100644 > --- a/libavcodec/pcm_tablegen.h > +++ b/libavcodec/pcm_tablegen.h > @@ -42,6 +42,7 @@ > #define VIDC_SEG_SHIFT (5) > #define VIDC_SEG_MASK (0xE0) > > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > /* alaw2linear() - Convert an A-law value to 16-bit linear PCM */ > static av_cold int alaw2linear(unsigned char a_val) > { > @@ -57,7 +58,9 @@ static av_cold int alaw2linear(unsigned char a_val) > > return (a_val & SIGN_BIT) ? t : -t; > } > +#endif > > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > static av_cold int ulaw2linear(unsigned char u_val) > { > int t; > @@ -74,7 +77,9 @@ static av_cold int ulaw2linear(unsigned char u_val) > > return (u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS); > } > +#endif > > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > static av_cold int vidc2linear(unsigned char u_val) > { > int t; > @@ -88,6 +93,7 @@ static av_cold int vidc2linear(unsigned char u_val) > > return (u_val & VIDC_SIGN_BIT) ? (BIAS - t) : (t - BIAS); > } > +#endif > > #if CONFIG_HARDCODED_TABLES > #define pcm_alaw_tableinit() > @@ -96,10 +102,19 @@ static av_cold int vidc2linear(unsigned char u_val) > #include "libavcodec/pcm_tables.h" > #else > /* 16384 entries per table */ > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > static uint8_t linear_to_alaw[16384]; > +#endif > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > static uint8_t linear_to_ulaw[16384]; > +#endif > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > static uint8_t linear_to_vidc[16384]; > +#endif > > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ > + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ > + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, > int (*xlaw2linear)(unsigned char), > int mask) > @@ -123,21 +138,28 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, > } > linear_to_xlaw[0] = linear_to_xlaw[1]; > } > +#endif > > +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER > static void pcm_alaw_tableinit(void) > { > build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); > } > +#endif > > +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER > static void pcm_ulaw_tableinit(void) > { > build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); > } > +#endif > > +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER > static void pcm_vidc_tableinit(void) > { > build_xlaw_table(linear_to_vidc, vidc2linear, 0xff); > } > +#endif > #endif /* CONFIG_HARDCODED_TABLES */ This is static stuff; the compiler can already optimize it away when it sees that it is not referenced by anything that is kept. > > #endif /* AVCODEC_PCM_TABLEGEN_H */ _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".