virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

als: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 16:59:43 -05:00
parent 5cd597f22f
commit 9b0b355e97
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/alsdec.c
View File

@ -192,7 +192,6 @@ typedef struct {
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame;
ALSSpecificConfig sconf; ALSSpecificConfig sconf;
GetBitContext gb; GetBitContext gb;
DSPContext dsp; DSPContext dsp;
@ -1432,6 +1431,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
AVPacket *avpkt) AVPacket *avpkt)
{ {
ALSDecContext *ctx = avctx->priv_data; ALSDecContext *ctx = avctx->priv_data;
AVFrame *frame = data;
ALSSpecificConfig *sconf = &ctx->sconf; ALSSpecificConfig *sconf = &ctx->sconf;
const uint8_t *buffer = avpkt->data; const uint8_t *buffer = avpkt->data;
int buffer_size = avpkt->size; int buffer_size = avpkt->size;
@ -1461,8 +1461,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
ctx->frame_id++; ctx->frame_id++;
/* get output buffer */ /* get output buffer */
ctx->frame.nb_samples = ctx->cur_frame_length; frame->nb_samples = ctx->cur_frame_length;
if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) { if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
@ -1470,7 +1470,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
// transform decoded frame into output format // transform decoded frame into output format
#define INTERLEAVE_OUTPUT(bps) \ #define INTERLEAVE_OUTPUT(bps) \
{ \ { \
int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \ int##bps##_t *dest = (int##bps##_t*)frame->data[0]; \
shift = bps - ctx->avctx->bits_per_raw_sample; \ shift = bps - ctx->avctx->bits_per_raw_sample; \
for (sample = 0; sample < ctx->cur_frame_length; sample++) \ for (sample = 0; sample < ctx->cur_frame_length; sample++) \
for (c = 0; c < avctx->channels; c++) \ for (c = 0; c < avctx->channels; c++) \
@ -1488,7 +1488,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
int swap = HAVE_BIGENDIAN != sconf->msb_first; int swap = HAVE_BIGENDIAN != sconf->msb_first;
if (ctx->avctx->bits_per_raw_sample == 24) { if (ctx->avctx->bits_per_raw_sample == 24) {
int32_t *src = (int32_t *)ctx->frame.data[0]; int32_t *src = (int32_t *)frame->data[0];
for (sample = 0; for (sample = 0;
sample < ctx->cur_frame_length * avctx->channels; sample < ctx->cur_frame_length * avctx->channels;
@ -1509,7 +1509,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
if (swap) { if (swap) {
if (ctx->avctx->bits_per_raw_sample <= 16) { if (ctx->avctx->bits_per_raw_sample <= 16) {
int16_t *src = (int16_t*) ctx->frame.data[0]; int16_t *src = (int16_t*) frame->data[0];
int16_t *dest = (int16_t*) ctx->crc_buffer; int16_t *dest = (int16_t*) ctx->crc_buffer;
for (sample = 0; for (sample = 0;
sample < ctx->cur_frame_length * avctx->channels; sample < ctx->cur_frame_length * avctx->channels;
@ -1517,12 +1517,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
*dest++ = av_bswap16(src[sample]); *dest++ = av_bswap16(src[sample]);
} else { } else {
ctx->dsp.bswap_buf((uint32_t*)ctx->crc_buffer, ctx->dsp.bswap_buf((uint32_t*)ctx->crc_buffer,
(uint32_t *)ctx->frame.data[0], (uint32_t *)frame->data[0],
ctx->cur_frame_length * avctx->channels); ctx->cur_frame_length * avctx->channels);
} }
crc_source = ctx->crc_buffer; crc_source = ctx->crc_buffer;
} else { } else {
crc_source = ctx->frame.data[0]; crc_source = frame->data[0];
} }
ctx->crc = av_crc(ctx->crc_table, ctx->crc, crc_source, ctx->crc = av_crc(ctx->crc_table, ctx->crc, crc_source,
@ -1538,9 +1538,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
} }
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = ctx->frame;
bytes_read = invalid_frame ? buffer_size : bytes_read = invalid_frame ? buffer_size :
(get_bits_count(&ctx->gb) + 7) >> 3; (get_bits_count(&ctx->gb) + 7) >> 3;
@ -1737,9 +1735,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_dsputil_init(&ctx->dsp, avctx); ff_dsputil_init(&ctx->dsp, avctx);
avcodec_get_frame_defaults(&ctx->frame);
avctx->coded_frame = &ctx->frame;
return 0; return 0;
} }