RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

twinvq: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 20:08:05 -05:00
parent ad2104ba44
commit 3b7d43383f
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/twinvq.c
View File

@ -177,7 +177,6 @@ static const ModeTab mode_44_48 = {
typedef struct TwinContext { typedef struct TwinContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame;
AVFloatDSPContext fdsp; AVFloatDSPContext fdsp;
FFTContext mdct_ctx[3]; FFTContext mdct_ctx[3];
@ -811,6 +810,7 @@ static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb,
static int twin_decode_frame(AVCodecContext * avctx, void *data, static int twin_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;
TwinContext *tctx = avctx->priv_data; TwinContext *tctx = avctx->priv_data;
@ -832,12 +832,12 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
/* get output buffer */ /* get output buffer */
if (tctx->discarded_packets >= 2) { if (tctx->discarded_packets >= 2) {
tctx->frame.nb_samples = mtab->size; frame->nb_samples = mtab->size;
if ((ret = ff_get_buffer(avctx, &tctx->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;
} }
out = (float **)tctx->frame.extended_data; out = (float **)frame->extended_data;
} }
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
@ -863,8 +863,7 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
return buf_size; return buf_size;
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = tctx->frame;;
return buf_size; return buf_size;
} }
@ -1166,9 +1165,6 @@ static av_cold int twin_decode_init(AVCodecContext *avctx)
memset_float(tctx->bark_hist[0][0], 0.1, FF_ARRAY_ELEMS(tctx->bark_hist)); memset_float(tctx->bark_hist[0][0], 0.1, FF_ARRAY_ELEMS(tctx->bark_hist));
avcodec_get_frame_defaults(&tctx->frame);
avctx->coded_frame = &tctx->frame;
return 0; return 0;
} }