X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fpcm.c;h=32231125d2e900d85aa412b2c4b14cb170191008;hb=55b9ef18e4a139fc24a3b695cb3c176f3ced09b8;hp=5570c01bd1e1444ee7ab7cb9b515334b3cba302c;hpb=e2e712e7c133978c1758cdebba537646ce5c363a;p=ffmpeg diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 5570c01bd1e..32231125d2e 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -1,157 +1,59 @@ /* * PCM codecs - * Copyright (c) 2001 Fabrice Bellard. + * Copyright (c) 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file pcm.c + * @file * PCM codecs */ #include "avcodec.h" -#include "bitstream.h" // for ff_reverse +#include "libavutil/common.h" /* for av_reverse */ +#include "bytestream.h" +#include "pcm_tablegen.h" -/* from g711.c by SUN microsystems (unrestricted use) */ +#define MAX_CHANNELS 64 -#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ -#define QUANT_MASK (0xf) /* Quantization field mask. */ -#define NSEGS (8) /* Number of A-law segments. */ -#define SEG_SHIFT (4) /* Left shift for segment number. */ -#define SEG_MASK (0x70) /* Segment field mask. */ - -#define BIAS (0x84) /* Bias for linear code. */ - -/* - * alaw2linear() - Convert an A-law value to 16-bit linear PCM - * - */ -static int alaw2linear(unsigned char a_val) -{ - int t; - int seg; - - a_val ^= 0x55; - - t = a_val & QUANT_MASK; - seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT; - if(seg) t= (t + t + 1 + 32) << (seg + 2); - else t= (t + t + 1 ) << 3; - - return ((a_val & SIGN_BIT) ? t : -t); -} - -static int ulaw2linear(unsigned char u_val) -{ - int t; - - /* Complement to obtain normal u-law value. */ - u_val = ~u_val; - - /* - * Extract and bias the quantization bits. Then - * shift up by the segment number and subtract out the bias. - */ - t = ((u_val & QUANT_MASK) << 3) + BIAS; - t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT; - - return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS)); -} - -/* 16384 entries per table */ -static uint8_t linear_to_alaw[16384]; -static uint8_t linear_to_ulaw[16384]; - -static void build_xlaw_table(uint8_t *linear_to_xlaw, - int (*xlaw2linear)(unsigned char), - int mask) -{ - int i, j, v, v1, v2; - - j = 0; - for(i=0;i<128;i++) { - if (i != 127) { - v1 = xlaw2linear(i ^ mask); - v2 = xlaw2linear((i + 1) ^ mask); - v = (v1 + v2 + 4) >> 3; - } else { - v = 8192; - } - for(;j 0) - linear_to_xlaw[8192 - j] = (i ^ (mask ^ 0x80)); - } - } - linear_to_xlaw[0] = linear_to_xlaw[1]; -} - -static int pcm_encode_init(AVCodecContext *avctx) +static av_cold int pcm_encode_init(AVCodecContext *avctx) { - avctx->frame_size = 1; + avctx->frame_size = 0; switch(avctx->codec->id) { case CODEC_ID_PCM_ALAW: - build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); - break; - case CODEC_ID_PCM_MULAW: - build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); - break; - default: - 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: - 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; + pcm_alaw_tableinit(); 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; + pcm_ulaw_tableinit(); 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; return 0; } -static int pcm_encode_close(AVCodecContext *avctx) +static av_cold int pcm_encode_close(AVCodecContext *avctx) { av_freep(&avctx->coded_frame); @@ -159,162 +61,126 @@ static 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) { - if (bps > 2) - memset(*dst, 0, n * bps); - if (le) *dst += bps - 2; - for(;n>0;n--) { - register int v = *(*samples)++; - if (us) v += 0x8000; - (*dst)[le] = v >> 8; - (*dst)[1 - le] = v; - *dst += bps; +#define ENCODE(type, endian, src, dst, n, shift, offset) \ + samples_##type = (const 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) { int n, sample_size, v; - short *samples; + const 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: - 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; - } + const uint8_t *srcu8; + const int16_t *samples_int16_t; + const int32_t *samples_int32_t; + const int64_t *samples_int64_t; + const uint16_t *samples_uint16_t; + const 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; switch(avctx->codec->id) { - 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] + - (ff_reverse[*samples & 0xff] << 8); + uint32_t tmp = av_reverse[(*samples >> 8) & 0xff] + + (av_reverse[*samples & 0xff] << 8); tmp <<= 4; // sync flags would go here - dst[2] = tmp & 0xff; - tmp >>= 8; - dst[1] = tmp & 0xff; - dst[0] = tmp >> 8; + bytestream_put_be24(&dst, tmp); samples++; - dst += 3; - } - break; - case CODEC_ID_PCM_S16LE: - for(;n>0;n--) { - v = *samples++; - dst[0] = v & 0xff; - dst[1] = v >> 8; - dst += 2; - } - break; - case CODEC_ID_PCM_S16BE: - for(;n>0;n--) { - v = *samples++; - dst[0] = v >> 8; - dst[1] = v; - dst += 2; } break; case CODEC_ID_PCM_U16LE: - for(;n>0;n--) { - v = *samples++; - v += 0x8000; - dst[0] = v & 0xff; - dst[1] = v >> 8; - dst += 2; - } + ENCODE(uint16_t, le16, samples, dst, n, 0, 0x8000) break; case CODEC_ID_PCM_U16BE: - for(;n>0;n--) { - v = *samples++; - v += 0x8000; - dst[0] = v >> 8; - dst[1] = v; - dst += 2; - } + ENCODE(uint16_t, be16, samples, dst, n, 0, 0x8000) break; case CODEC_ID_PCM_S8: + srcu8= data; for(;n>0;n--) { - v = *samples++; - dst[0] = v >> 8; - dst++; + 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[0] = (v >> 8) + 128; - dst++; - } + memcpy(dst, samples, n*sample_size); + dst += n*sample_size; break; case CODEC_ID_PCM_ALAW: for(;n>0;n--) { v = *samples++; - dst[0] = linear_to_alaw[(v + 32768) >> 2]; - dst++; + *dst++ = linear_to_alaw[(v + 32768) >> 2]; } break; case CODEC_ID_PCM_MULAW: for(;n>0;n--) { v = *samples++; - dst[0] = linear_to_ulaw[(v + 32768) >> 2]; - dst++; + *dst++ = linear_to_ulaw[(v + 32768) >> 2]; } break; default: @@ -326,14 +192,20 @@ static int pcm_encode_frame(AVCodecContext *avctx, } typedef struct PCMDecode { + AVFrame frame; short table[256]; } PCMDecode; -static int pcm_decode_init(AVCodecContext * avctx) +static av_cold int pcm_decode_init(AVCodecContext * avctx) { PCMDecode *s = avctx->priv_data; int i; + if (avctx->channels <= 0 || avctx->channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n"); + return AVERROR(EINVAL); + } + switch(avctx->codec->id) { case CODEC_ID_PCM_ALAW: for(i=0;i<256;i++) @@ -346,181 +218,312 @@ static int pcm_decode_init(AVCodecContext * avctx) default: break; } + + avctx->sample_fmt = avctx->codec->sample_fmts[0]; + + if (avctx->sample_fmt == AV_SAMPLE_FMT_S32) + avctx->bits_per_raw_sample = av_get_bits_per_sample(avctx->codec->id); + + avcodec_get_frame_defaults(&s->frame); + avctx->coded_frame = &s->frame; + return 0; } /** - * \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 size Data size 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, - uint8_t **src, short **samples, int src_len) -{ - register int n = src_len / bps; - if (le) *src += bps - 2; - for(;n>0;n--) { - *(*samples)++ = ((*src)[le] << 8 | (*src)[1 - le]) - (us?0x8000:0); - *src += bps; +#define DECODE(size, endian, src, dst, n, shift, offset) \ + for(;n>0;n--) { \ + uint##size##_t v = bytestream_get_##endian(&src); \ + AV_WN##size##A(dst, (v - offset) << shift); \ + dst += size / 8; \ } - if (le) *src -= bps - 2; -} -static int pcm_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - uint8_t *buf, int buf_size) +static int pcm_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) { + const uint8_t *src = avpkt->data; + int buf_size = avpkt->size; PCMDecode *s = avctx->priv_data; - int n; - short *samples; - uint8_t *src; + int sample_size, c, n, ret, samples_per_block; + uint8_t *samples; + int32_t *dst_int32_t; + + sample_size = av_get_bits_per_sample(avctx->codec_id)/8; + + /* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */ + samples_per_block = 1; + if (CODEC_ID_PCM_DVD == avctx->codec_id) { + if (avctx->bits_per_coded_sample != 20 && + avctx->bits_per_coded_sample != 24) { + av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); + return AVERROR(EINVAL); + } + /* 2 samples are interleaved per block in PCM_DVD */ + samples_per_block = 2; + sample_size = avctx->bits_per_coded_sample * 2 / 8; + } else if (avctx->codec_id == CODEC_ID_PCM_LXF) { + /* we process 40-bit blocks per channel for LXF */ + samples_per_block = 2; + sample_size = 5; + } - samples = data; - src = buf; + if (sample_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid sample_size\n"); + return AVERROR(EINVAL); + } + + n = avctx->channels * sample_size; - n= av_get_bits_per_sample(avctx->codec_id)/8; 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/sample_size; + + /* get output buffer */ + s->frame.nb_samples = n * samples_per_block / avctx->channels; + if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } + samples = s->frame.data[0]; switch(avctx->codec->id) { - 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(32, le32, src, samples, n, 0, 0x80000000) break; case CODEC_ID_PCM_U32BE: - decode_to16(4, 0, 1, &src, &samples, buf_size); + DECODE(32, be32, src, samples, n, 0, 0x80000000) break; case CODEC_ID_PCM_S24LE: - decode_to16(3, 1, 0, &src, &samples, buf_size); + DECODE(32, le24, src, samples, n, 8, 0) break; case CODEC_ID_PCM_S24BE: - decode_to16(3, 0, 0, &src, &samples, buf_size); + DECODE(32, be24, src, samples, n, 8, 0) break; case CODEC_ID_PCM_U24LE: - decode_to16(3, 1, 1, &src, &samples, buf_size); + DECODE(32, le24, src, samples, n, 8, 0x800000) break; case CODEC_ID_PCM_U24BE: - decode_to16(3, 0, 1, &src, &samples, buf_size); + DECODE(32, be24, src, samples, n, 8, 0x800000) break; case CODEC_ID_PCM_S24DAUD: - n = buf_size / 3; for(;n>0;n--) { - uint32_t v = src[0] << 16 | src[1] << 8 | src[2]; + uint32_t v = bytestream_get_be24(&src); v >>= 4; // sync flags are here - *samples++ = ff_reverse[(v >> 8) & 0xff] + - (ff_reverse[v & 0xff] << 8); - src += 3; + AV_WN16A(samples, av_reverse[(v >> 8) & 0xff] + + (av_reverse[v & 0xff] << 8)); + samples += 2; } break; - case CODEC_ID_PCM_S16LE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = src[0] | (src[1] << 8); - src += 2; - } - break; - case CODEC_ID_PCM_S16BE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = (src[0] << 8) | src[1]; - src += 2; - } + case CODEC_ID_PCM_S16LE_PLANAR: + { + const uint8_t *src2[MAX_CHANNELS]; + n /= avctx->channels; + for(c=0;cchannels;c++) + src2[c] = &src[c*n*2]; + for(;n>0;n--) + for(c=0;cchannels;c++) { + AV_WN16A(samples, bytestream_get_le16(&src2[c])); + samples += 2; + } break; + } case CODEC_ID_PCM_U16LE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = (src[0] | (src[1] << 8)) - 0x8000; - src += 2; - } + DECODE(16, le16, src, samples, n, 0, 0x8000) break; case CODEC_ID_PCM_U16BE: - n = buf_size >> 1; - for(;n>0;n--) { - *samples++ = ((src[0] << 8) | src[1]) - 0x8000; - src += 2; - } + DECODE(16, be16, src, samples, n, 0, 0x8000) break; case CODEC_ID_PCM_S8: - n = buf_size; for(;n>0;n--) { - *samples++ = src[0] << 8; - src++; + *samples++ = *src++ + 128; } break; +#if HAVE_BIGENDIAN + case CODEC_ID_PCM_F64LE: + DECODE(64, le64, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_F32LE: + DECODE(32, le32, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S16LE: + DECODE(16, 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(64, be64, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_F32BE: + case CODEC_ID_PCM_S32BE: + DECODE(32, be32, src, samples, n, 0, 0) + break; + case CODEC_ID_PCM_S16BE: + DECODE(16, 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[0] - 128) << 8; - src++; + memcpy(samples, src, n*sample_size); + break; + case CODEC_ID_PCM_ZORK: + for (; n > 0; n--) { + int v = *src++; + if (v < 128) + v = 128 - v; + *samples++ = v; } break; case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_MULAW: - n = buf_size; for(;n>0;n--) { - *samples++ = s->table[src[0]]; - src++; + AV_WN16A(samples, s->table[*src++]); + samples += 2; } break; + case CODEC_ID_PCM_DVD: + { + const uint8_t *src8; + dst_int32_t = (int32_t *)s->frame.data[0]; + n /= avctx->channels; + switch (avctx->bits_per_coded_sample) { + case 20: + while (n--) { + 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; + } + break; + } + case CODEC_ID_PCM_LXF: + { + int i; + const uint8_t *src8; + dst_int32_t = (int32_t *)s->frame.data[0]; + n /= avctx->channels; + //unpack and de-planerize + for (i = 0; i < n; i++) { + for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) { + //extract low 20 bits and expand to 32 bits + *dst_int32_t++ = (src8[2] << 28) | (src8[1] << 20) | (src8[0] << 12) | + ((src8[2] & 0xF) << 8) | src8[1]; + } + + for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) { + //extract high 20 bits and expand to 32 bits + *dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) | + ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4); + } + } + break; + } default: return -1; } - *data_size = (uint8_t *)samples - (uint8_t *)data; - return src - buf; -} -#define PCM_CODEC(id, name) \ -AVCodec name ## _encoder = { \ - #name, \ - CODEC_TYPE_AUDIO, \ - id, \ - 0, \ - pcm_encode_init, \ - pcm_encode_frame, \ - pcm_encode_close, \ - NULL, \ -}; \ -AVCodec name ## _decoder = { \ - #name, \ - CODEC_TYPE_AUDIO, \ - id, \ - sizeof(PCMDecode), \ - pcm_decode_init, \ - NULL, \ - NULL, \ - pcm_decode_frame, \ + *got_frame_ptr = 1; + *(AVFrame *)data = s->frame; + + return buf_size; } -PCM_CODEC(CODEC_ID_PCM_S32LE, pcm_s32le); -PCM_CODEC(CODEC_ID_PCM_S32BE, pcm_s32be); -PCM_CODEC(CODEC_ID_PCM_U32LE, pcm_u32le); -PCM_CODEC(CODEC_ID_PCM_U32BE, pcm_u32be); -PCM_CODEC(CODEC_ID_PCM_S24LE, pcm_s24le); -PCM_CODEC(CODEC_ID_PCM_S24BE, pcm_s24be); -PCM_CODEC(CODEC_ID_PCM_U24LE, pcm_u24le); -PCM_CODEC(CODEC_ID_PCM_U24BE, pcm_u24be); -PCM_CODEC(CODEC_ID_PCM_S24DAUD, pcm_s24daud); -PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le); -PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be); -PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le); -PCM_CODEC(CODEC_ID_PCM_U16BE, pcm_u16be); -PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8); -PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8); -PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw); -PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); - -#undef PCM_CODEC +#if CONFIG_ENCODERS +#define PCM_ENCODER(id_,sample_fmt_,name_,long_name_) \ +AVCodec ff_ ## name_ ## _encoder = { \ + .name = #name_, \ + .type = AVMEDIA_TYPE_AUDIO, \ + .id = id_, \ + .init = pcm_encode_init, \ + .encode = pcm_encode_frame, \ + .close = pcm_encode_close, \ + .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ +} +#else +#define PCM_ENCODER(id,sample_fmt_,name,long_name_) +#endif + +#if CONFIG_DECODERS +#define PCM_DECODER(id_,sample_fmt_,name_,long_name_) \ +AVCodec ff_ ## name_ ## _decoder = { \ + .name = #name_, \ + .type = AVMEDIA_TYPE_AUDIO, \ + .id = id_, \ + .priv_data_size = sizeof(PCMDecode), \ + .init = pcm_decode_init, \ + .decode = pcm_decode_frame, \ + .capabilities = CODEC_CAP_DR1, \ + .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ +} +#else +#define PCM_DECODER(id,sample_fmt_,name,long_name_) +#endif + +#define PCM_CODEC(id, sample_fmt_, name, long_name_) \ + 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, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law"); +PCM_DECODER(CODEC_ID_PCM_DVD, AV_SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-endian"); +PCM_CODEC (CODEC_ID_PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian"); +PCM_CODEC (CODEC_ID_PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian"); +PCM_CODEC (CODEC_ID_PCM_F64LE, AV_SAMPLE_FMT_DBL, pcm_f64le, "PCM 64-bit floating point little-endian"); +PCM_DECODER(CODEC_ID_PCM_LXF, AV_SAMPLE_FMT_S32, pcm_lxf, "PCM signed 20-bit little-endian planar"); +PCM_CODEC (CODEC_ID_PCM_MULAW, AV_SAMPLE_FMT_S16, pcm_mulaw, "PCM mu-law"); +PCM_CODEC (CODEC_ID_PCM_S8, AV_SAMPLE_FMT_U8, pcm_s8, "PCM signed 8-bit"); +PCM_CODEC (CODEC_ID_PCM_S16BE, AV_SAMPLE_FMT_S16, pcm_s16be, "PCM signed 16-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S16LE, AV_SAMPLE_FMT_S16, pcm_s16le, "PCM signed 16-bit little-endian"); +PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, AV_SAMPLE_FMT_S16, pcm_s16le_planar, "PCM 16-bit little-endian planar"); +PCM_CODEC (CODEC_ID_PCM_S24BE, AV_SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S24DAUD, AV_SAMPLE_FMT_S16, pcm_s24daud, "PCM D-Cinema audio signed 24-bit"); +PCM_CODEC (CODEC_ID_PCM_S24LE, AV_SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_S32BE, AV_SAMPLE_FMT_S32, pcm_s32be, "PCM signed 32-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_S32LE, AV_SAMPLE_FMT_S32, pcm_s32le, "PCM signed 32-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U8, AV_SAMPLE_FMT_U8, pcm_u8, "PCM unsigned 8-bit"); +PCM_CODEC (CODEC_ID_PCM_U16BE, AV_SAMPLE_FMT_S16, pcm_u16be, "PCM unsigned 16-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U16LE, AV_SAMPLE_FMT_S16, pcm_u16le, "PCM unsigned 16-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U24BE, AV_SAMPLE_FMT_S32, pcm_u24be, "PCM unsigned 24-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U24LE, AV_SAMPLE_FMT_S32, pcm_u24le, "PCM unsigned 24-bit little-endian"); +PCM_CODEC (CODEC_ID_PCM_U32BE, AV_SAMPLE_FMT_S32, pcm_u32be, "PCM unsigned 32-bit big-endian"); +PCM_CODEC (CODEC_ID_PCM_U32LE, AV_SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned 32-bit little-endian"); +PCM_DECODER(CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");