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

atrac3: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 17:24:53 -05:00
parent 0ded61b57a
commit 9a75ace2b2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/atrac3.c
View File

@ -86,7 +86,6 @@ typedef struct ChannelUnit {
} ChannelUnit; } ChannelUnit;
typedef struct ATRAC3Context { typedef struct ATRAC3Context {
AVFrame frame;
GetBitContext gb; GetBitContext gb;
//@{ //@{
/** stream data */ /** stream data */
@ -798,6 +797,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf,
static int atrac3_decode_frame(AVCodecContext *avctx, void *data, static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
AVFrame *frame = data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
ATRAC3Context *q = avctx->priv_data; ATRAC3Context *q = avctx->priv_data;
@ -811,8 +811,8 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
} }
/* get output buffer */ /* get output buffer */
q->frame.nb_samples = SAMPLES_PER_FRAME; frame->nb_samples = SAMPLES_PER_FRAME;
if ((ret = ff_get_buffer(avctx, &q->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;
} }
@ -825,14 +825,13 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
databuf = buf; databuf = buf;
} }
ret = decode_frame(avctx, databuf, (float **)q->frame.extended_data); ret = decode_frame(avctx, databuf, (float **)frame->extended_data);
if (ret) { if (ret) {
av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n"); av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n");
return ret; return ret;
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = q->frame;
return avctx->block_align; return avctx->block_align;
} }
@ -986,9 +985,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
avcodec_get_frame_defaults(&q->frame);
avctx->coded_frame = &q->frame;
return 0; return 0;
} }