har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmdaudio: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 20:10:01 -05:00
parent 3b7d43383f
commit f80f8dd4c2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/vmdav.c
View File

@ -476,7 +476,6 @@ static av_cold int vmdvideo_decode_end(AVCodecContext *avctx)
#define BLOCK_TYPE_SILENCE 3 #define BLOCK_TYPE_SILENCE 3
typedef struct VmdAudioContext { typedef struct VmdAudioContext {
AVFrame frame;
int out_bps; int out_bps;
int chunk_size; int chunk_size;
} VmdAudioContext; } VmdAudioContext;
@ -521,9 +520,6 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx)
s->chunk_size = avctx->block_align + avctx->channels * (s->out_bps == 2); s->chunk_size = avctx->block_align + avctx->channels * (s->out_bps == 2);
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, " av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, "
"block align = %d, sample rate = %d\n", "block align = %d, sample rate = %d\n",
avctx->channels, avctx->bits_per_coded_sample, avctx->block_align, avctx->channels, avctx->bits_per_coded_sample, avctx->block_align,
@ -564,6 +560,7 @@ static void decode_audio_s16(int16_t *out, const uint8_t *buf, int buf_size,
static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data, static int vmdaudio_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;
const uint8_t *buf_end; const uint8_t *buf_end;
int buf_size = avpkt->size; int buf_size = avpkt->size;
@ -608,13 +605,14 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
audio_chunks = buf_size / s->chunk_size; audio_chunks = buf_size / s->chunk_size;
/* get output buffer */ /* get output buffer */
s->frame.nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) / avctx->channels; frame->nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) /
if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { avctx->channels;
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;
} }
output_samples_u8 = s->frame.data[0]; output_samples_u8 = frame->data[0];
output_samples_s16 = (int16_t *)s->frame.data[0]; output_samples_s16 = (int16_t *)frame->data[0];
/* decode silent chunks */ /* decode silent chunks */
if (silent_chunks > 0) { if (silent_chunks > 0) {
@ -644,8 +642,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
return avpkt->size; return avpkt->size;
} }