RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-08 18:28:19 +00:00
Code Issues Projects Releases Wiki Activity

adxdec: use planar sample format

Browse Source
This commit is contained in:
Justin Ruggles 2012-09-21 10:48:12 -04:00
parent 4ebd74cec7
commit cbcd497f38
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/adxdec.c
View File

@ -49,7 +49,7 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)
c->header_parsed = 1; c->header_parsed = 1;
} }
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
avcodec_get_frame_defaults(&c->frame); avcodec_get_frame_defaults(&c->frame);
avctx->coded_frame = &c->frame; avctx->coded_frame = &c->frame;
@ -64,7 +64,8 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)
* 2nd-order LPC filter applied to it to form the output signal for a single * 2nd-order LPC filter applied to it to form the output signal for a single
* channel. * channel.
*/ */
static int adx_decode(ADXContext *c, int16_t *out, const uint8_t *in, int ch) static int adx_decode(ADXContext *c, int16_t *out, int offset,
const uint8_t *in, int ch)
{ {
ADXChannelState *prev = &c->prev[ch]; ADXChannelState *prev = &c->prev[ch];
GetBitContext gb; GetBitContext gb;
@ -77,6 +78,7 @@ static int adx_decode(ADXContext *c, int16_t *out, const uint8_t *in, int ch)
return -1; return -1;
init_get_bits(&gb, in + 2, (BLOCK_SIZE - 2) * 8); init_get_bits(&gb, in + 2, (BLOCK_SIZE - 2) * 8);
out += offset;
s1 = prev->s1; s1 = prev->s1;
s2 = prev->s2; s2 = prev->s2;
for (i = 0; i < BLOCK_SAMPLES; i++) { for (i = 0; i < BLOCK_SAMPLES; i++) {
@ -84,8 +86,7 @@ static int adx_decode(ADXContext *c, int16_t *out, const uint8_t *in, int ch)
s0 = ((d << COEFF_BITS) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) >> COEFF_BITS; s0 = ((d << COEFF_BITS) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) >> COEFF_BITS;
s2 = s1; s2 = s1;
s1 = av_clip_int16(s0); s1 = av_clip_int16(s0);
*out = s1; *out++ = s1;
out += c->channels;
} }
prev->s1 = s1; prev->s1 = s1;
prev->s2 = s2; prev->s2 = s2;
@ -98,7 +99,8 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,
{ {
int buf_size = avpkt->size; int buf_size = avpkt->size;
ADXContext *c = avctx->priv_data; ADXContext *c = avctx->priv_data;
int16_t *samples; int16_t **samples;
int samples_offset;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int num_blocks, ch, ret; int num_blocks, ch, ret;
@ -144,11 +146,12 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
samples = (int16_t *)c->frame.data[0]; samples = (int16_t **)c->frame.extended_data;
samples_offset = 0;
while (num_blocks--) { while (num_blocks--) {
for (ch = 0; ch < c->channels; ch++) { for (ch = 0; ch < c->channels; ch++) {
if (adx_decode(c, samples + ch, buf, ch)) { if (adx_decode(c, samples[ch], samples_offset, buf, ch)) {
c->eof = 1; c->eof = 1;
buf = avpkt->data + avpkt->size; buf = avpkt->data + avpkt->size;
break; break;
@ -156,7 +159,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,
buf_size -= BLOCK_SIZE; buf_size -= BLOCK_SIZE;
buf += BLOCK_SIZE; buf += BLOCK_SIZE;
} }
samples += BLOCK_SAMPLES * c->channels; samples_offset += BLOCK_SAMPLES;
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
@ -182,4 +185,6 @@ AVCodec ff_adpcm_adx_decoder = {
.flush = adx_decode_flush, .flush = adx_decode_flush,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
}; };