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

vima: decode directly to the user-provided AVFrame

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-02-13 12:06:40 +00:00
parent 845fa2f5c9
commit 9145818ecd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vima.c
View File

@ -26,7 +26,6 @@
#include "adpcm_data.h" #include "adpcm_data.h"
typedef struct { typedef struct {
AVFrame frame;
uint16_t predict_table[5786 * 2]; uint16_t predict_table[5786 * 2];
} VimaContext; } VimaContext;
@ -125,8 +124,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
} }
} }
avcodec_get_frame_defaults(&vima->frame);
avctx->coded_frame = &vima->frame;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0; return 0;
@ -137,6 +134,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
{ {
GetBitContext gb; GetBitContext gb;
VimaContext *vima = avctx->priv_data; VimaContext *vima = avctx->priv_data;
AVFrame *frame = data;
int16_t pcm_data[2]; int16_t pcm_data[2];
uint32_t samples; uint32_t samples;
int8_t channel_hint[2]; int8_t channel_hint[2];
@ -171,14 +169,14 @@ static int decode_frame(AVCodecContext *avctx, void *data,
pcm_data[1] = get_sbits(&gb, 16); pcm_data[1] = get_sbits(&gb, 16);
} }
vima->frame.nb_samples = samples; frame->nb_samples = samples;
if ((ret = ff_get_buffer(avctx, &vima->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;
} }
for (chan = 0; chan < channels; chan++) { for (chan = 0; chan < channels; chan++) {
uint16_t *dest = (uint16_t*)vima->frame.data[0] + chan; uint16_t *dest = (uint16_t*)frame->data[0] + chan;
int step_index = channel_hint[chan]; int step_index = channel_hint[chan];
int output = pcm_data[chan]; int output = pcm_data[chan];
int sample; int sample;
@ -221,7 +219,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = vima->frame;
return pkt->size; return pkt->size;
} }