Mercurial > libavcodec.hg
changeset 5940:d63186919b60 libavcodec
add pcm_s16le_planar support for electronicarts files
| author | aurel |
|---|---|
| date | Sun, 25 Nov 2007 16:32:47 +0000 |
| parents | b47573cb7401 |
| children | d030978bcd93 |
| files | Makefile allcodecs.c avcodec.h pcm.c utils.c |
| diffstat | 5 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Nov 25 16:23:42 2007 +0000 +++ b/Makefile Sun Nov 25 16:32:47 2007 +0000 @@ -245,6 +245,7 @@ OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)+= pcm.o OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.o
--- a/allcodecs.c Sun Nov 25 16:23:42 2007 +0000 +++ b/allcodecs.c Sun Nov 25 16:32:47 2007 +0000 @@ -211,6 +211,7 @@ REGISTER_ENCDEC (PCM_S8, pcm_s8); REGISTER_ENCDEC (PCM_S16BE, pcm_s16be); REGISTER_ENCDEC (PCM_S16LE, pcm_s16le); + REGISTER_DECODER (PCM_S16LE_PLANAR, pcm_s16le_planar); REGISTER_ENCDEC (PCM_S24BE, pcm_s24be); REGISTER_ENCDEC (PCM_S24DAUD, pcm_s24daud); REGISTER_ENCDEC (PCM_S24LE, pcm_s24le);
--- a/avcodec.h Sun Nov 25 16:23:42 2007 +0000 +++ b/avcodec.h Sun Nov 25 16:32:47 2007 +0000 @@ -189,6 +189,7 @@ CODEC_ID_PCM_U24BE, CODEC_ID_PCM_S24DAUD, CODEC_ID_PCM_ZORK, + CODEC_ID_PCM_S16LE_PLANAR, /* various ADPCM codecs */ CODEC_ID_ADPCM_IMA_QT= 0x11000,
--- a/pcm.c Sun Nov 25 16:23:42 2007 +0000 +++ b/pcm.c Sun Nov 25 16:32:47 2007 +0000 @@ -28,6 +28,8 @@ #include "bitstream.h" // for ff_reverse #include "bytestream.h" +#define MAX_CHANNELS 64 + /* from g711.c by SUN microsystems (unrestricted use) */ #define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ @@ -374,15 +376,15 @@ uint8_t *buf, int buf_size) { PCMDecode *s = avctx->priv_data; - int n; + int c, n; short *samples; - uint8_t *src; + uint8_t *src, *src2[MAX_CHANNELS]; samples = data; src = buf; n= av_get_bits_per_sample(avctx->codec_id)/8; - if(n && buf_size % n){ + if((n && buf_size % n) || avctx->channels > MAX_CHANNELS){ av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n"); return -1; } @@ -390,6 +392,10 @@ buf_size= FFMIN(buf_size, *data_size/2); *data_size=0; + n = buf_size/avctx->channels; + for(c=0;c<avctx->channels;c++) + src2[c] = &src[c*n]; + switch(avctx->codec->id) { case CODEC_ID_PCM_S32LE: decode_to16(4, 1, 0, &src, &samples, buf_size); @@ -430,6 +436,12 @@ *samples++ = bytestream_get_le16(&src); } break; + case CODEC_ID_PCM_S16LE_PLANAR: + for(n>>=1;n>0;n--) + for(c=0;c<avctx->channels;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--) { @@ -528,6 +540,7 @@ 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_DECODER(CODEC_ID_PCM_S16LE_PLANAR, pcm_s16le_planar); PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be); PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le); PCM_CODEC(CODEC_ID_PCM_U16BE, pcm_u16be);
--- a/utils.c Sun Nov 25 16:23:42 2007 +0000 +++ b/utils.c Sun Nov 25 16:32:47 2007 +0000 @@ -1189,6 +1189,7 @@ break; case CODEC_ID_PCM_S16LE: case CODEC_ID_PCM_S16BE: + case CODEC_ID_PCM_S16LE_PLANAR: case CODEC_ID_PCM_U16LE: case CODEC_ID_PCM_U16BE: bitrate = enc->sample_rate * enc->channels * 16; @@ -1314,6 +1315,7 @@ return 8; case CODEC_ID_PCM_S16BE: case CODEC_ID_PCM_S16LE: + case CODEC_ID_PCM_S16LE_PLANAR: case CODEC_ID_PCM_U16BE: case CODEC_ID_PCM_U16LE: return 16;