X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpcm.c;h=a0ce9f5783e9205756ae5161355c2a7ef555e531;hb=6249c33e5ad09d1167dc8c949e7f96a2d4bfd26d;hp=e86532437cedb652b468fc1e103c51662ae1a3ed;hpb=0fd7e57e7d284176839bff612cd1af3cadc3fe86;p=ffmpeg diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index e86532437ce..a0ce9f5783e 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -1,6 +1,6 @@ /* * PCM codecs - * Copyright (c) 2001 Fabrice Bellard. + * Copyright (c) 2001 Fabrice Bellard * * This file is part of FFmpeg. * @@ -20,12 +20,12 @@ */ /** - * @file pcm.c + * @file libavcodec/pcm.c * PCM codecs */ #include "avcodec.h" -#include "bitstream.h" // for ff_reverse +#include "get_bits.h" // for ff_reverse #include "bytestream.h" #define MAX_CHANNELS 64 @@ -107,9 +107,6 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, static av_cold int pcm_encode_init(AVCodecContext *avctx) { avctx->frame_size = 1; - if (avctx->codec->id==CODEC_ID_PCM_F32BE && avctx->sample_fmt!=SAMPLE_FMT_FLT) { - return -1; - } switch(avctx->codec->id) { case CODEC_ID_PCM_ALAW: build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); @@ -121,37 +118,8 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) break; } - switch(avctx->codec->id) { - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_U32LE: - case CODEC_ID_PCM_U32BE: - case CODEC_ID_PCM_F32BE: - avctx->block_align = 4 * avctx->channels; - break; - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_U24LE: - case CODEC_ID_PCM_U24BE: - case CODEC_ID_PCM_S24DAUD: - avctx->block_align = 3 * avctx->channels; - break; - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: - avctx->block_align = 2 * avctx->channels; - break; - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: - case CODEC_ID_PCM_MULAW: - case CODEC_ID_PCM_ALAW: - avctx->block_align = avctx->channels; - break; - default: - break; - } - + avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); + avctx->block_align = avctx->channels * avctx->bits_per_coded_sample/8; avctx->coded_frame= avcodec_alloc_frame(); avctx->coded_frame->key_frame= 1; @@ -166,29 +134,21 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx) } /** - * \brief convert samples from 16 bit - * \param bps byte per sample for the destination format, must be >= 2 - * \param le 0 for big-, 1 for little-endian - * \param us 0 for signed, 1 for unsigned output - * \param samples input samples - * \param dst output samples - * \param n number of samples in samples buffer. + * Write PCM samples macro + * @param type Datatype of native machine format + * @param endian bytestream_put_xxx() suffix + * @param src Source pointer (variable name) + * @param dst Destination pointer (variable name) + * @param n Total number of samples (variable name) + * @param shift Bitshift (bits) + * @param offset Sample value offset */ -static inline void encode_from16(int bps, int le, int us, - short **samples, uint8_t **dst, int n) { - int usum = us ? 0x8000 : 0; - if (bps > 2) - memset(*dst, 0, n * bps); - if (le) *dst += bps - 2; - for(;n>0;n--) { - register int v = *(*samples)++; - v += usum; - if (le) AV_WL16(*dst, v); - else AV_WB16(*dst, v); - *dst += bps; +#define ENCODE(type, endian, src, dst, n, shift, offset) \ + samples_##type = (type*)src; \ + for(;n>0;n--) { \ + register type v = (*samples_##type++ >> shift) + offset; \ + bytestream_put_##endian(&dst, v); \ } - if (le) *dst -= bps - 2; -} static int pcm_encode_frame(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) @@ -196,117 +156,98 @@ static int pcm_encode_frame(AVCodecContext *avctx, int n, sample_size, v; short *samples; unsigned char *dst; - - switch(avctx->codec->id) { - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_U32LE: - case CODEC_ID_PCM_U32BE: - case CODEC_ID_PCM_F32BE: - sample_size = 4; - break; - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_U24LE: - case CODEC_ID_PCM_U24BE: - case CODEC_ID_PCM_S24DAUD: - sample_size = 3; - break; - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: - sample_size = 2; - break; - default: - sample_size = 1; - break; - } + uint8_t *srcu8; + int16_t *samples_int16_t; + int32_t *samples_int32_t; + int64_t *samples_int64_t; + uint16_t *samples_uint16_t; + uint32_t *samples_uint32_t; + + sample_size = av_get_bits_per_sample(avctx->codec->id)/8; n = buf_size / sample_size; samples = data; dst = frame; + if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) { + av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n"); + return -1; + } + switch(avctx->codec->id) { - case CODEC_ID_PCM_F32BE: - { - float *fsamples = data; - for(;n>0;n--) { - float fv = *fsamples++; - bytestream_put_be32(&dst, av_flt2int(fv)); - } - samples = (void*)fsamples; - } - break; - case CODEC_ID_PCM_S32LE: - encode_from16(4, 1, 0, &samples, &dst, n); - break; - case CODEC_ID_PCM_S32BE: - encode_from16(4, 0, 0, &samples, &dst, n); - break; case CODEC_ID_PCM_U32LE: - encode_from16(4, 1, 1, &samples, &dst, n); + ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000) break; case CODEC_ID_PCM_U32BE: - encode_from16(4, 0, 1, &samples, &dst, n); + ENCODE(uint32_t, be32, samples, dst, n, 0, 0x80000000) break; case CODEC_ID_PCM_S24LE: - encode_from16(3, 1, 0, &samples, &dst, n); + ENCODE(int32_t, le24, samples, dst, n, 8, 0) break; case CODEC_ID_PCM_S24BE: - encode_from16(3, 0, 0, &samples, &dst, n); + ENCODE(int32_t, be24, samples, dst, n, 8, 0) break; case CODEC_ID_PCM_U24LE: - encode_from16(3, 1, 1, &samples, &dst, n); + ENCODE(uint32_t, le24, samples, dst, n, 8, 0x800000) break; case CODEC_ID_PCM_U24BE: - encode_from16(3, 0, 1, &samples, &dst, n); + ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000) break; case CODEC_ID_PCM_S24DAUD: for(;n>0;n--) { - uint32_t tmp = ff_reverse[*samples >> 8] + + uint32_t tmp = ff_reverse[(*samples >> 8) & 0xff] + (ff_reverse[*samples & 0xff] << 8); tmp <<= 4; // sync flags would go here bytestream_put_be24(&dst, tmp); samples++; } break; - case CODEC_ID_PCM_S16LE: - for(;n>0;n--) { - v = *samples++; - bytestream_put_le16(&dst, v); - } - break; - case CODEC_ID_PCM_S16BE: - for(;n>0;n--) { - v = *samples++; - bytestream_put_be16(&dst, v); - } - break; case CODEC_ID_PCM_U16LE: - for(;n>0;n--) { - v = *samples++; - v += 0x8000; - bytestream_put_le16(&dst, v); - } + ENCODE(uint16_t, le16, samples, dst, n, 0, 0x8000) break; case CODEC_ID_PCM_U16BE: - for(;n>0;n--) { - v = *samples++; - v += 0x8000; - bytestream_put_be16(&dst, v); - } + ENCODE(uint16_t, be16, samples, dst, n, 0, 0x8000) break; case CODEC_ID_PCM_S8: + srcu8= data; for(;n>0;n--) { - v = *samples++; - *dst++ = v >> 8; + v = *srcu8++; + *dst++ = v - 128; } break; +#if HAVE_BIGENDIAN + case CODEC_ID_PCM_F64LE: + ENCODE(int64_t, le64, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_F32LE: + ENCODE(int32_t, le32, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_S16LE: + ENCODE(int16_t, le16, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_F64BE: + case CODEC_ID_PCM_F32BE: + case CODEC_ID_PCM_S32BE: + case CODEC_ID_PCM_S16BE: +#else + case CODEC_ID_PCM_F64BE: + ENCODE(int64_t, be64, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_F32BE: + case CODEC_ID_PCM_S32BE: + ENCODE(int32_t, be32, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_S16BE: + ENCODE(int16_t, be16, samples, dst, n, 0, 0) + break; + case CODEC_ID_PCM_F64LE: + case CODEC_ID_PCM_F32LE: + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_S16LE: +#endif /* HAVE_BIGENDIAN */ case CODEC_ID_PCM_U8: - for(;n>0;n--) { - v = *samples++; - *dst++ = (v >> 8) + 128; - } + memcpy(dst, samples, n*sample_size); + dst += n*sample_size; break; case CODEC_ID_PCM_ZORK: for(;n>0;n--) { @@ -363,102 +304,95 @@ static av_cold int pcm_decode_init(AVCodecContext * avctx) } /** - * \brief convert samples to 16 bit - * \param bps byte per sample for the source format, must be >= 2 - * \param le 0 for big-, 1 for little-endian - * \param us 0 for signed, 1 for unsigned input - * \param src input samples - * \param samples output samples - * \param src_len number of bytes in src + * Read PCM samples macro + * @param type Datatype of native machine format + * @param endian bytestream_get_xxx() endian suffix + * @param src Source pointer (variable name) + * @param dst Destination pointer (variable name) + * @param n Total number of samples (variable name) + * @param shift Bitshift (bits) + * @param offset Sample value offset */ -static inline void decode_to16(int bps, int le, int us, - const uint8_t **src, short **samples, int src_len) -{ - int usum = us ? -0x8000 : 0; - register int n = src_len / bps; - if (le) *src += bps - 2; - for(;n>0;n--) { - register int v; - if (le) v = AV_RL16(*src); - else v = AV_RB16(*src); - v += usum; - *(*samples)++ = v; - *src += bps; - } - if (le) *src -= bps - 2; -} +#define DECODE(type, endian, src, dst, n, shift, offset) \ + dst_##type = (type*)dst; \ + for(;n>0;n--) { \ + register type v = bytestream_get_##endian(&src); \ + *dst_##type++ = (v - offset) << shift; \ + } \ + dst = (short*)dst_##type; static int pcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PCMDecode *s = avctx->priv_data; - int c, n; + int sample_size, c, n; short *samples; - const uint8_t *src, *src2[MAX_CHANNELS]; + const uint8_t *src, *src8, *src2[MAX_CHANNELS]; + uint8_t *dstu8; + int16_t *dst_int16_t; + int32_t *dst_int32_t; + int64_t *dst_int64_t; + uint16_t *dst_uint16_t; + uint32_t *dst_uint32_t; samples = data; src = buf; + if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) { + av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n"); + return -1; + } + if(avctx->channels <= 0 || avctx->channels > MAX_CHANNELS){ av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n"); return -1; } - n = avctx->channels * av_get_bits_per_sample(avctx->codec_id)/8; + sample_size = av_get_bits_per_sample(avctx->codec_id)/8; + /* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */ if (CODEC_ID_PCM_DVD == avctx->codec_id) /* 2 samples are interleaved per block in PCM_DVD */ - n = 2 * avctx->channels * avctx->bits_per_sample/8; + sample_size = avctx->bits_per_coded_sample * 2 / 8; + + n = avctx->channels * sample_size; if(n && buf_size % n){ - av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n"); - return -1; + if (buf_size < n) { + av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n"); + return -1; + }else + buf_size -= buf_size % n; } buf_size= FFMIN(buf_size, *data_size/2); *data_size=0; - n = buf_size/avctx->channels; - for(c=0;cchannels;c++) - src2[c] = &src[c*n]; + n = buf_size/sample_size; switch(avctx->codec->id) { - case CODEC_ID_PCM_F32BE: - { - float *fsamples = data; - n = buf_size >> 2; - for(;n>0;n--) - *fsamples++ = av_int2flt(bytestream_get_be32(&src)); - samples = (void*)fsamples; - break; - } - case CODEC_ID_PCM_S32LE: - decode_to16(4, 1, 0, &src, &samples, buf_size); - break; - case CODEC_ID_PCM_S32BE: - decode_to16(4, 0, 0, &src, &samples, buf_size); - break; case CODEC_ID_PCM_U32LE: - decode_to16(4, 1, 1, &src, &samples, buf_size); + DECODE(uint32_t, le32, src, samples, n, 0, 0x80000000) break; case CODEC_ID_PCM_U32BE: - decode_to16(4, 0, 1, &src, &samples, buf_size); + DECODE(uint32_t, be32, src, samples, n, 0, 0x80000000) break; case CODEC_ID_PCM_S24LE: - decode_to16(3, 1, 0, &src, &samples, buf_size); + DECODE(int32_t, le24, src, samples, n, 8, 0) break; case CODEC_ID_PCM_S24BE: - decode_to16(3, 0, 0, &src, &samples, buf_size); + DECODE(int32_t, be24, src, samples, n, 8, 0) break; case CODEC_ID_PCM_U24LE: - decode_to16(3, 1, 1, &src, &samples, buf_size); + DECODE(uint32_t, le24, src, samples, n, 8, 0x800000) break; case CODEC_ID_PCM_U24BE: - decode_to16(3, 0, 1, &src, &samples, buf_size); + DECODE(uint32_t, be24, src, samples, n, 8, 0x800000) break; case CODEC_ID_PCM_S24DAUD: - n = buf_size / 3; for(;n>0;n--) { uint32_t v = bytestream_get_be24(&src); v >>= 4; // sync flags are here @@ -466,50 +400,65 @@ static int pcm_decode_frame(AVCodecContext *avctx, (ff_reverse[v & 0xff] << 8); } break; - case CODEC_ID_PCM_S16LE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = bytestream_get_le16(&src); - } - break; case CODEC_ID_PCM_S16LE_PLANAR: - for(n>>=1;n>0;n--) + n /= avctx->channels; + for(c=0;cchannels;c++) + src2[c] = &src[c*n*2]; + for(;n>0;n--) for(c=0;cchannels;c++) *samples++ = bytestream_get_le16(&src2[c]); src = src2[avctx->channels-1]; break; - case CODEC_ID_PCM_S16BE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = bytestream_get_be16(&src); - } - break; case CODEC_ID_PCM_U16LE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = bytestream_get_le16(&src) - 0x8000; - } + DECODE(uint16_t, le16, src, samples, n, 0, 0x8000) break; case CODEC_ID_PCM_U16BE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = bytestream_get_be16(&src) - 0x8000; - } + DECODE(uint16_t, be16, src, samples, n, 0, 0x8000) break; case CODEC_ID_PCM_S8: - n = buf_size; + dstu8= (uint8_t*)samples; for(;n>0;n--) { - *samples++ = *src++ << 8; + *dstu8++ = *src++ + 128; } + samples= (short*)dstu8; + break; +#if HAVE_BIGENDIAN + case CODEC_ID_PCM_F64LE: + DECODE(int64_t, le64, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_F32LE: + DECODE(int32_t, le32, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S16LE: + DECODE(int16_t, le16, src, samples, n, 0, 0) break; + case CODEC_ID_PCM_F64BE: + case CODEC_ID_PCM_F32BE: + case CODEC_ID_PCM_S32BE: + case CODEC_ID_PCM_S16BE: +#else + case CODEC_ID_PCM_F64BE: + DECODE(int64_t, be64, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_F32BE: + case CODEC_ID_PCM_S32BE: + DECODE(int32_t, be32, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S16BE: + DECODE(int16_t, be16, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_F64LE: + case CODEC_ID_PCM_F32LE: + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_S16LE: +#endif /* HAVE_BIGENDIAN */ case CODEC_ID_PCM_U8: - n = buf_size; - for(;n>0;n--) { - *samples++ = ((int)*src++ - 128) << 8; - } + memcpy(samples, src, n*sample_size); + src += n*sample_size; + samples = (short*)((uint8_t*)data + n*sample_size); break; case CODEC_ID_PCM_ZORK: - n = buf_size; for(;n>0;n--) { int x= *src++; if(x&128) x-= 128; @@ -519,24 +468,42 @@ static int pcm_decode_frame(AVCodecContext *avctx, break; case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_MULAW: - n = buf_size; for(;n>0;n--) { *samples++ = s->table[*src++]; } break; case CODEC_ID_PCM_DVD: - if(avctx->bits_per_sample != 20 && avctx->bits_per_sample != 24) { - av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); - return -1; - } else { - int jump = avctx->channels * (avctx->bits_per_sample-16) / 4; - n = buf_size / (avctx->channels * 2 * avctx->bits_per_sample / 8); + dst_int32_t = data; + n /= avctx->channels; + switch (avctx->bits_per_coded_sample) { + case 20: while (n--) { - for (c=0; c < 2*avctx->channels; c++) - *samples++ = bytestream_get_be16(&src); - src += jump; + c = avctx->channels; + src8 = src + 4*c; + while (c--) { + *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8 &0xf0) << 8); + *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ &0x0f) << 12); + } + src = src8; } + break; + case 24: + while (n--) { + c = avctx->channels; + src8 = src + 4*c; + while (c--) { + *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8); + *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8); + } + src = src8; + } + break; + default: + av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); + return -1; + break; } + samples = (short *) dst_int32_t; break; default: return -1; @@ -545,7 +512,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, return src - buf; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS #define PCM_ENCODER(id,sample_fmt_,name,long_name_) \ AVCodec name ## _encoder = { \ #name, \ @@ -556,14 +523,14 @@ AVCodec name ## _encoder = { \ pcm_encode_frame, \ pcm_encode_close, \ NULL, \ - .sample_fmts = (enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ + .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else #define PCM_ENCODER(id,sample_fmt_,name,long_name_) #endif -#ifdef CONFIG_DECODERS +#if CONFIG_DECODERS #define PCM_DECODER(id,sample_fmt_,name,long_name_) \ AVCodec name ## _decoder = { \ #name, \ @@ -574,7 +541,7 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ pcm_decode_frame, \ - .sample_fmts = (enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ + .sample_fmts = (const enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else @@ -585,24 +552,27 @@ AVCodec name ## _decoder = { \ PCM_ENCODER(id,sample_fmt_,name,long_name_) PCM_DECODER(id,sample_fmt_,name,long_name_) /* Note: Do not forget to add new entries to the Makefile as well. */ -PCM_CODEC (CODEC_ID_PCM_ALAW, SAMPLE_FMT_S16, pcm_alaw, "A-law PCM"); -PCM_CODEC (CODEC_ID_PCM_DVD, SAMPLE_FMT_S16, pcm_dvd, "signed 16|20|24-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_F32BE, SAMPLE_FMT_FLT, pcm_f32be, "32-bit floating point big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_MULAW, SAMPLE_FMT_S16, pcm_mulaw, "mu-law PCM"); -PCM_CODEC (CODEC_ID_PCM_S8, SAMPLE_FMT_S16, pcm_s8, "signed 8-bit PCM"); -PCM_CODEC (CODEC_ID_PCM_S16BE, SAMPLE_FMT_S16, pcm_s16be, "signed 16-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_S16LE, SAMPLE_FMT_S16, pcm_s16le, "signed 16-bit little-endian PCM"); -PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, SAMPLE_FMT_S16, pcm_s16le_planar, "16-bit little-endian planar PCM"); -PCM_CODEC (CODEC_ID_PCM_S24BE, SAMPLE_FMT_S16, pcm_s24be, "signed 24-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_S24DAUD, SAMPLE_FMT_S16, pcm_s24daud, "D-Cinema audio signed 24-bit PCM"); -PCM_CODEC (CODEC_ID_PCM_S24LE, SAMPLE_FMT_S16, pcm_s24le, "signed 24-bit little-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_S32BE, SAMPLE_FMT_S16, pcm_s32be, "signed 32-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_S32LE, SAMPLE_FMT_S16, pcm_s32le, "signed 32-bit little-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U8, SAMPLE_FMT_S16, pcm_u8, "unsigned 8-bit PCM"); -PCM_CODEC (CODEC_ID_PCM_U16BE, SAMPLE_FMT_S16, pcm_u16be, "unsigned 16-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U16LE, SAMPLE_FMT_S16, pcm_u16le, "unsigned 16-bit little-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U24BE, SAMPLE_FMT_S16, pcm_u24be, "unsigned 24-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U24LE, SAMPLE_FMT_S16, pcm_u24le, "unsigned 24-bit little-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U32BE, SAMPLE_FMT_S16, pcm_u32be, "unsigned 32-bit big-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_U32LE, SAMPLE_FMT_S16, pcm_u32le, "unsigned 32-bit little-endian PCM"); -PCM_CODEC (CODEC_ID_PCM_ZORK, SAMPLE_FMT_S16, pcm_zork, "Zork PCM"); +PCM_CODEC (CODEC_ID_PCM_ALAW, SAMPLE_FMT_S16, pcm_alaw, "PCM A-law"); +PCM_CODEC (CODEC_ID_PCM_DVD, SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_F32BE, SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-endian"); +PCM_CODEC (CODEC_ID_PCM_F32LE, SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian"); +PCM_CODEC (CODEC_ID_PCM_F64BE, SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian"); +PCM_CODEC (CODEC_ID_PCM_F64LE, SAMPLE_FMT_DBL, pcm_f64le, "PCM 64-bit floating point little-endian"); +PCM_CODEC (CODEC_ID_PCM_MULAW, SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law"); +PCM_CODEC (CODEC_ID_PCM_S8, SAMPLE_FMT_U8, pcm_s8, "PCM signed 8-bit"); +PCM_CODEC (CODEC_ID_PCM_S16BE, SAMPLE_FMT_S16, pcm_s16be, "PCM signed 16-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S16LE, SAMPLE_FMT_S16, pcm_s16le, "PCM signed 16-bit little-endian"); +PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, SAMPLE_FMT_S16, pcm_s16le_planar, "PCM 16-bit little-endian planar"); +PCM_CODEC (CODEC_ID_PCM_S24BE, SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S24DAUD, SAMPLE_FMT_S16, pcm_s24daud, "PCM D-Cinema audio signed 24-bit"); +PCM_CODEC (CODEC_ID_PCM_S24LE, SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_S32BE, SAMPLE_FMT_S32, pcm_s32be, "PCM signed 32-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S32LE, SAMPLE_FMT_S32, pcm_s32le, "PCM signed 32-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U8, SAMPLE_FMT_U8, pcm_u8, "PCM unsigned 8-bit"); +PCM_CODEC (CODEC_ID_PCM_U16BE, SAMPLE_FMT_S16, pcm_u16be, "PCM unsigned 16-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U16LE, SAMPLE_FMT_S16, pcm_u16le, "PCM unsigned 16-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U24BE, SAMPLE_FMT_S32, pcm_u24be, "PCM unsigned 24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U24LE, SAMPLE_FMT_S32, pcm_u24le, "PCM unsigned 24-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U32BE, SAMPLE_FMT_S32, pcm_u32be, "PCM unsigned 32-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U32LE, SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned 32-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_ZORK, SAMPLE_FMT_S16, pcm_zork, "PCM Zork");