github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/pcm: use stricter conditional expressions for compilation

Browse Source
This commit is contained in:
Zhao Zhili
2025-09-02 10:36:16 +08:00
committed by Zhao Zhili
parent 893250a734
commit ca1ab8815c
2 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/pcm.c
View File

@@ -227,7 +227,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
bytestream_put_buffer(&dst, src, n * sample_size); bytestream_put_buffer(&dst, src, n * sample_size);
} }
break; break;
#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER #if CONFIG_PCM_ALAW_ENCODER
case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_ALAW:
for (; n > 0; n--) { for (; n > 0; n--) {
v = *samples++; v = *samples++;
@@ -235,7 +235,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
break; break;
#endif #endif
#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER #if CONFIG_PCM_MULAW_ENCODER
case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_MULAW:
for (; n > 0; n--) { for (; n > 0; n--) {
v = *samples++; v = *samples++;
@@ -243,7 +243,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
break; break;
#endif #endif
#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER #if CONFIG_PCM_VIDC_ENCODER
case AV_CODEC_ID_PCM_VIDC: case AV_CODEC_ID_PCM_VIDC:
for (; n > 0; n--) { for (; n > 0; n--) {
v = *samples++; v = *samples++;
@@ -346,19 +346,19 @@ static av_cold av_unused int pcm_lut_decode_init(AVCodecContext *avctx)
switch (avctx->codec_id) { switch (avctx->codec_id) {
default: default:
av_unreachable("pcm_lut_decode_init() only used with alaw, mulaw and vidc"); 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: case AV_CODEC_ID_PCM_ALAW:
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
s->table[i] = alaw2linear(i); s->table[i] = alaw2linear(i);
break; break;
#endif #endif
#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER #if CONFIG_PCM_MULAW_DECODER
case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_MULAW:
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
s->table[i] = ulaw2linear(i); s->table[i] = ulaw2linear(i);
break; break;
#endif #endif
#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER #if CONFIG_PCM_VIDC_DECODER
case AV_CODEC_ID_PCM_VIDC: case AV_CODEC_ID_PCM_VIDC:
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
s->table[i] = vidc2linear(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); bytestream_get_buffer(&src, samples, n * sample_size);
} }
break; break;
#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ #if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_MULAW_DECODER || \
CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ CONFIG_PCM_VIDC_DECODER
CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER
case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_ALAW:
case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_MULAW:
case AV_CODEC_ID_PCM_VIDC: { case AV_CODEC_ID_PCM_VIDC: {
@@ -684,9 +683,7 @@ const FFCodec ff_ ## name_ ## _decoder = { \
* to the table in pcm_decode_init() as well. */ * to the table in pcm_decode_init() as well. */
// AV_CODEC_ID_* pcm_* name // AV_CODEC_ID_* pcm_* name
// AV_SAMPLE_FMT_* long name DecodeContext decode init func // 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); 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 (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_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"); 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 (F64BE, DBL, f64be, "PCM 64-bit floating point big-endian");
PCM_CODEC (F64LE, DBL, f64le, "PCM 64-bit floating point little-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"); 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); 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, U8, s8, "PCM signed 8-bit");
PCM_CODEC (S8_PLANAR, U8P, s8_planar, "PCM signed 8-bit planar"); PCM_CODEC (S8_PLANAR, U8P, s8_planar, "PCM signed 8-bit planar");
PCM_CODEC (S16BE, S16, s16be, "PCM signed 16-bit big-endian"); 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 (U32LE, S32, u32le, "PCM unsigned 32-bit little-endian");
PCM_CODEC (S64BE, S64, s64be, "PCM signed 64-bit big-endian"); PCM_CODEC (S64BE, S64, s64be, "PCM signed 64-bit big-endian");
PCM_CODEC (S64LE, S64, s64le, "PCM signed 64-bit little-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); PCM_CODEC_EXT(VIDC, S16, vidc, "PCM Archimedes VIDC", PCMLUTDecode, pcm_lut_decode_init);
#endif
PCM_DECODER (SGA, U8, sga, "PCM SGA"); PCM_DECODER (SGA, U8, sga, "PCM SGA");

24
libavcodec/pcm_tablegen.h
View File

@@ -102,20 +102,9 @@ static av_cold int vidc2linear(unsigned char u_val)
#define pcm_vidc_tableinit() #define pcm_vidc_tableinit()
#include "libavcodec/pcm_tables.h" #include "libavcodec/pcm_tables.h"
#else #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 || \ #if CONFIG_PCM_ALAW_ENCODER || CONFIG_PCM_MULAW_ENCODER || \
CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ CONFIG_PCM_VIDC_ENCODER
CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER
static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw,
int (*xlaw2linear)(unsigned char), int (*xlaw2linear)(unsigned char),
int mask) int mask)
@@ -141,21 +130,24 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw,
} }
#endif #endif
#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER #if CONFIG_PCM_ALAW_ENCODER
static uint8_t linear_to_alaw[16384];
static void pcm_alaw_tableinit(void) static void pcm_alaw_tableinit(void)
{ {
build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5);
} }
#endif #endif
#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER #if CONFIG_PCM_MULAW_ENCODER
static uint8_t linear_to_ulaw[16384];
static void pcm_ulaw_tableinit(void) static void pcm_ulaw_tableinit(void)
{ {
build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff);
} }
#endif #endif
#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER #if CONFIG_PCM_VIDC_ENCODER
static uint8_t linear_to_vidc[16384];
static void pcm_vidc_tableinit(void) static void pcm_vidc_tableinit(void)
{ {
build_xlaw_table(linear_to_vidc, vidc2linear, 0xff); build_xlaw_table(linear_to_vidc, vidc2linear, 0xff);