memcpy(dst, samples, n*sample_size);
dst += n*sample_size;
break;
- case CODEC_ID_PCM_ZORK:
- for(;n>0;n--) {
- v= *samples++ >> 8;
- if(v<0) v = -v;
- else v+= 128;
- *dst++ = v;
- }
- break;
case CODEC_ID_PCM_ALAW:
for(;n>0;n--) {
v = *samples++;
}
typedef struct PCMDecode {
+ AVFrame frame;
short table[256];
} PCMDecode;
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;
}
dst += size / 8; \
}
-static int pcm_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- AVPacket *avpkt)
+static int pcm_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data;
+ const uint8_t *src = avpkt->data;
int buf_size = avpkt->size;
PCMDecode *s = avctx->priv_data;
- int sample_size, c, n, i;
+ int sample_size, c, n, ret, samples_per_block;
uint8_t *samples;
- const uint8_t *src, *src8, *src2[MAX_CHANNELS];
int32_t *dst_int32_t;
- samples = data;
- src = buf;
-
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) {
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)
+ } 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;
+ }
if (sample_size == 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid sample_size\n");
buf_size -= buf_size % n;
}
- buf_size= FFMIN(buf_size, *data_size/2);
-
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_U32LE:
DECODE(32, le32, src, samples, n, 0, 0x80000000)
}
break;
case CODEC_ID_PCM_S16LE_PLANAR:
+ {
+ const uint8_t *src2[MAX_CHANNELS];
n /= avctx->channels;
for(c=0;c<avctx->channels;c++)
src2[c] = &src[c*n*2];
AV_WN16A(samples, bytestream_get_le16(&src2[c]));
samples += 2;
}
- src = src2[avctx->channels-1];
break;
+ }
case CODEC_ID_PCM_U16LE:
DECODE(16, le16, src, samples, n, 0, 0x8000)
break;
#endif /* HAVE_BIGENDIAN */
case CODEC_ID_PCM_U8:
memcpy(samples, src, n*sample_size);
- src += n*sample_size;
- samples += n * sample_size;
break;
case CODEC_ID_PCM_ZORK:
- for(;n>0;n--) {
- int x= *src++;
- if(x&128) x-= 128;
- else x = -x;
- AV_WN16A(samples, x << 8);
- samples += 2;
+ for (; n > 0; n--) {
+ int v = *src++;
+ if (v < 128)
+ v = 128 - v;
+ *samples++ = v;
}
break;
case CODEC_ID_PCM_ALAW:
}
break;
case CODEC_ID_PCM_DVD:
- dst_int32_t = data;
+ {
+ const uint8_t *src8;
+ dst_int32_t = (int32_t *)s->frame.data[0];
n /= avctx->channels;
switch (avctx->bits_per_coded_sample) {
case 20:
}
break;
}
- samples = (uint8_t *) dst_int32_t;
break;
+ }
case CODEC_ID_PCM_LXF:
- dst_int32_t = data;
+ {
+ 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++) {
((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
}
}
- src += n * avctx->channels * 5;
- samples = (uint8_t *) dst_int32_t;
break;
+ }
default:
return -1;
}
- *data_size = samples - (uint8_t *)data;
- return src - buf;
+
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = s->frame;
+
+ return buf_size;
}
#if CONFIG_ENCODERS
.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_), \
}
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_CODEC (CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_S16, pcm_zork, "PCM Zork");
+PCM_DECODER(CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");