virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cinaudio: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 17:47:02 -05:00
parent 182821cff4
commit 97c7bdc6d4
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/dsicinav.c
View File

@ -46,7 +46,6 @@ typedef struct CinVideoContext {
} CinVideoContext; } CinVideoContext;
typedef struct CinAudioContext { typedef struct CinAudioContext {
AVFrame frame;
int initial_decode_frame; int initial_decode_frame;
int delta; int delta;
} CinAudioContext; } CinAudioContext;
@ -327,15 +326,13 @@ static av_cold int cinaudio_decode_init(AVCodecContext *avctx)
avctx->channels = 1; avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->channel_layout = AV_CH_LAYOUT_MONO;
avcodec_get_frame_defaults(&cin->frame);
avctx->coded_frame = &cin->frame;
return 0; return 0;
} }
static int cinaudio_decode_frame(AVCodecContext *avctx, void *data, static int cinaudio_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;
CinAudioContext *cin = avctx->priv_data; CinAudioContext *cin = avctx->priv_data;
const uint8_t *buf_end = buf + avpkt->size; const uint8_t *buf_end = buf + avpkt->size;
@ -343,12 +340,12 @@ static int cinaudio_decode_frame(AVCodecContext *avctx, void *data,
int delta, ret; int delta, ret;
/* get output buffer */ /* get output buffer */
cin->frame.nb_samples = avpkt->size - cin->initial_decode_frame; frame->nb_samples = avpkt->size - cin->initial_decode_frame;
if ((ret = ff_get_buffer(avctx, &cin->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;
} }
samples = (int16_t *)cin->frame.data[0]; samples = (int16_t *)frame->data[0];
delta = cin->delta; delta = cin->delta;
if (cin->initial_decode_frame) { if (cin->initial_decode_frame) {
@ -364,8 +361,7 @@ static int cinaudio_decode_frame(AVCodecContext *avctx, void *data,
} }
cin->delta = delta; cin->delta = delta;
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = cin->frame;
return avpkt->size; return avpkt->size;
} }