From 44caa86d68adfbc63652ced5b1b7edc2c8fe3bc8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 16 May 2008 00:26:02 +0000 Subject: Add PCM codec long names; by Stefano Sabatini, stefano.sabatini-lala poste it. Originally committed as revision 13179 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pcm.c | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'libavcodec/pcm.c') diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 0c47eedff6..9cc14dc051 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -500,7 +500,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, } #ifdef CONFIG_ENCODERS -#define PCM_ENCODER(id,name) \ +#define PCM_ENCODER(id,name,long_name_) \ AVCodec name ## _encoder = { \ #name, \ CODEC_TYPE_AUDIO, \ @@ -510,13 +510,14 @@ AVCodec name ## _encoder = { \ pcm_encode_frame, \ pcm_encode_close, \ NULL, \ + .long_name = long_name_, \ }; #else -#define PCM_ENCODER(id,name) +#define PCM_ENCODER(id,name,long_name_) #endif #ifdef CONFIG_DECODERS -#define PCM_DECODER(id,name) \ +#define PCM_DECODER(id,name,long_name_) \ AVCodec name ## _decoder = { \ #name, \ CODEC_TYPE_AUDIO, \ @@ -526,30 +527,31 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ pcm_decode_frame, \ + .long_name = long_name_, \ }; #else -#define PCM_DECODER(id,name) +#define PCM_DECODER(id,name,long_name_) #endif -#define PCM_CODEC(id, name) \ -PCM_ENCODER(id,name) PCM_DECODER(id,name) - -PCM_CODEC (CODEC_ID_PCM_ALAW, pcm_alaw); -PCM_CODEC (CODEC_ID_PCM_MULAW, pcm_mulaw); -PCM_CODEC (CODEC_ID_PCM_S8, pcm_s8); -PCM_CODEC (CODEC_ID_PCM_S16BE, pcm_s16be); -PCM_CODEC (CODEC_ID_PCM_S16LE, pcm_s16le); -PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, pcm_s16le_planar); -PCM_CODEC (CODEC_ID_PCM_S24BE, pcm_s24be); -PCM_CODEC (CODEC_ID_PCM_S24DAUD, pcm_s24daud); -PCM_CODEC (CODEC_ID_PCM_S24LE, pcm_s24le); -PCM_CODEC (CODEC_ID_PCM_S32BE, pcm_s32be); -PCM_CODEC (CODEC_ID_PCM_S32LE, pcm_s32le); -PCM_CODEC (CODEC_ID_PCM_U8, pcm_u8); -PCM_CODEC (CODEC_ID_PCM_U16BE, pcm_u16be); -PCM_CODEC (CODEC_ID_PCM_U16LE, pcm_u16le); -PCM_CODEC (CODEC_ID_PCM_U24BE, pcm_u24be); -PCM_CODEC (CODEC_ID_PCM_U24LE, pcm_u24le); -PCM_CODEC (CODEC_ID_PCM_U32BE, pcm_u32be); -PCM_CODEC (CODEC_ID_PCM_U32LE, pcm_u32le); -PCM_CODEC (CODEC_ID_PCM_ZORK, pcm_zork); +#define PCM_CODEC(id, name, long_name_) \ + PCM_ENCODER(id,name,long_name_) PCM_DECODER(id,name,long_name_) + +PCM_CODEC (CODEC_ID_PCM_ALAW, pcm_alaw, "A-law PCM"); +PCM_CODEC (CODEC_ID_PCM_MULAW, pcm_mulaw, "mu-law PCM"); +PCM_CODEC (CODEC_ID_PCM_S8, pcm_s8, "signed 8-bit PCM"); +PCM_CODEC (CODEC_ID_PCM_S16BE, pcm_s16be, "signed 16-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_S16LE, pcm_s16le, "signed 16-bit big-endian PCM"); +PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, pcm_s16le_planar, "16-bit little-endian planar PCM"); +PCM_CODEC (CODEC_ID_PCM_S24BE, pcm_s24be, "signed 24-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_S24DAUD, pcm_s24daud, "D-Cinema audio signed 24-bit PCM"); +PCM_CODEC (CODEC_ID_PCM_S24LE, pcm_s24le, "signed 24-bit little-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_S32BE, pcm_s32be, "signed 32-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_S32LE, pcm_s32le, "signed 32-bit little-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U8, pcm_u8, "unsigned 8-bit PCM"); +PCM_CODEC (CODEC_ID_PCM_U16BE, pcm_u16be, "unsigned 16-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U16LE, pcm_u16le, "unsigned 16-bit little-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U24BE, pcm_u24be, "unsigned 24-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U24LE, pcm_u24le, "unsigned 24-bit little-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U32BE, pcm_u32be, "unsigned 32-bit big-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_U32LE, pcm_u32le, "unsigned 32-bit little-endian PCM"); +PCM_CODEC (CODEC_ID_PCM_ZORK, pcm_zork, "Zork PCM"); -- cgit v1.2.3