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 B598F4C04F for ; Tue, 2 Sep 2025 03:51:20 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'6DNgLZf31TkptMLKDqHNhqNbH7buAOO+EPxYqFR+ftk=', expected b'y0ulL6I2TOWk252LNWmEUr41yt4QnxcVxGQMY/l2wuA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756784984; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=6DNgLZf31TkptMLKDqHNhqNbH7buAOO+EPxYqFR+ftk=; b=OFJWCdaAwL15g8tFqNmB/KiEhB5/DZWeL6044Ktoa659JrkrEMC7z6IPt7mypaY+ZMIjO tcgY9vu8BqDTroPoRyRTdduoc5eSteu4KR7y5ph7bMwyXhxN98O5XB99EXv/qobDFxb56DQ Wz3I+KI1sYDAonRlcZd7q8ipNa/xJsCrIoRRbOlR6YkVjOXwE19ME5gsOJi1hxLlJtSoSMm 4fZSEe9zMjTP5WYnYfbV4u5XkYF0A6pMDpWPOLEr5KJbbV9TTYE4aIstgDyNTtGAWiQZig5 Flh2+Gs9XuKcWjJO3p21IGJuw0SMiAF3eB8iTFcZwO6qnYXBL+xo8yzJcOAg== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BBAFF68E74F; Tue, 2 Sep 2025 06:49:44 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756784955; b=bozIz/C6XFZN/d0GHR0uA/vn5Vyk+Nhd5t7AXo2mpM9qzIKzuIPR9P4hByGqcYeCEjXmJ hFLFPW/YIXfcCt9b6T4L+BmAuVSK3KmwORK9E6fIskn+aeZAw38gLVuGH6Kl9pKpIjEpGod 2OL5ShcWejjtJt9/VIaBXb0KWqw0MdBCMo6qdj3eV/8M5MUejVxvaLwNpkjM9/10Ow2y8+Q QVdd1KIiu4ASBh+D02goVrBeReZyTNqjvuhxjC16/e85YAsjpsvkhevgG0MCN98OkjFzSCk ilL08So36KUOJNUlXxkJutC5wkQl5wUmALQ6ht1ghRLha7ecoCEEbN3XfSnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756784955; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=IZ6UPMG/orAP4iuRvs5SRo7UQveD2YtIyMQ+XxZZ0i8=; b=jEevFky9QWNusO2+WN86hsv55CkyWXGevByzWpUn48hfMJy375RYazSGS8wDih98+EJl2 KFxXhPmDRP56J3CA6KWfgV6UEHc7m1HM8TxiHPPvvlFLw07H5/Z1GoWu7H9+9eTGtg4AdsZ fbDU26lZYjiFekeWFrtkwSrN4C8Llba+W+PL8k5/e/1FE12d2O3TiqhFXSCGIIqmn+eKbxn iYMJ3KYuybgNNzMtQwmzhd/Y/4CdfVTMgNSv/dPIij3wrX33uvBTly0dbd6OUeX4zVzPGNw DexIJKR9GiKlmYx1DarKBXVDHF8AT/9o0etvRJKj3Rxk+TspGjtaIch9uqkQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756784940; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=y0ulL6I2TOWk252LNWmEUr41yt4QnxcVxGQMY/l2wuA=; b=dgEup2zn1GqjB7f76ZVZHRPKJLOwfaVv3rHd9Ze5fxOefH7Kt4Ks4eRcHTSVB5solEE98 rv8VxZGD55rBkNumkv1M1Xxk47ThNxknzx+NSXI4koZuQum4JY8gz/8nCcIhTh3ZGwA+5i1 2Kxe3mndN7OjVw/1gkwiWNmYHnnDvWvWHUtnn2JSo0wsCvNDQBiJkdVvT409m89iDogJHMq XMnw8W2m9Dr0SDJ1PRO8sGl4SJOyMy3rgZjzvfVebg+R5dgvzfr5RGj6ormuPt+yv3aOqTd Lx48ksgrJfn8oGEBnYsJquLj72rsYYYuT7NK8zrRtWoq1T2htJV5TCqe4HzQ== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A74E068E709 for ; Tue, 2 Sep 2025 06:49:00 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175678494097.25.1346449447974040767@463a07221176> Message-ID-Hash: U4SX4SRQYWA364KF4K7EMK5CGMRP5US3 X-Message-ID-Hash: U4SX4SRQYWA364KF4K7EMK5CGMRP5US3 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/pcm: use stricter conditional expressions for compilation (PR #20394) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20394 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20394 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20394.patch >>From 90c931e6b05c184473b5a47bd30f5bbca14ca3af Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Tue, 2 Sep 2025 10:36:16 +0800 Subject: [PATCH] avcodec/pcm: use stricter conditional expressions for compilation --- libavcodec/pcm.c | 23 ++++++++--------------- libavcodec/pcm_tablegen.h | 17 ++++++++--------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 7132eeb8de..71b040c9b6 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -227,7 +227,7 @@ 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 +#if CONFIG_PCM_ALAW_ENCODER case AV_CODEC_ID_PCM_ALAW: for (; n > 0; n--) { v = *samples++; @@ -235,7 +235,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } break; #endif -#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER +#if CONFIG_PCM_MULAW_ENCODER case AV_CODEC_ID_PCM_MULAW: for (; n > 0; n--) { v = *samples++; @@ -243,7 +243,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } break; #endif -#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER +#if CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_VIDC: for (; n > 0; n--) { v = *samples++; @@ -346,19 +346,19 @@ static av_cold av_unused int pcm_lut_decode_init(AVCodecContext *avctx) switch (avctx->codec_id) { default: av_unreachable("pcm_lut_decode_init() only used with alaw, mulaw and vidc"); -#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER +#if CONFIG_PCM_ALAW_DECODER 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 +#if CONFIG_PCM_MULAW_DECODER 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 +#if CONFIG_PCM_VIDC_DECODER case AV_CODEC_ID_PCM_VIDC: for (int i = 0; i < 256; i++) s->table[i] = vidc2linear(i); @@ -570,9 +570,8 @@ 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 +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_MULAW_DECODER || \ + CONFIG_PCM_VIDC_DECODER case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_VIDC: { @@ -684,9 +683,7 @@ 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 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"); @@ -694,9 +691,7 @@ 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"); @@ -719,7 +714,5 @@ 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 590ba59814..181db1b1c0 100644 --- a/libavcodec/pcm_tablegen.h +++ b/libavcodec/pcm_tablegen.h @@ -102,19 +102,18 @@ 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 +#if CONFIG_PCM_ALAW_ENCODER static uint8_t linear_to_alaw[16384]; #endif -#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER +#if CONFIG_PCM_MULAW_ENCODER static uint8_t linear_to_ulaw[16384]; #endif -#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER +#if 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 +#if CONFIG_PCM_ALAW_ENCODER || CONFIG_PCM_MULAW_ENCODER || \ + CONFIG_PCM_VIDC_ENCODER static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, int (*xlaw2linear)(unsigned char), int mask) @@ -140,21 +139,21 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, } #endif -#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER +#if 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 +#if 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 +#if CONFIG_PCM_VIDC_ENCODER static void pcm_vidc_tableinit(void) { build_xlaw_table(linear_to_vidc, vidc2linear, 0xff); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org