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

mpegaudio: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 19:34:54 -05:00
parent dc33fbbfd0
commit 2c785e250a
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/mpegaudiodec.c
View File

@ -24,6 +24,7 @@
* MPEG Audio decoder
*/
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
@ -84,7 +85,7 @@ typedef struct MPADecodeContext {
AVCodecContext* avctx;
MPADSPContext mpadsp;
AVFloatDSPContext fdsp;
AVFrame frame;
AVFrame *frame;
} MPADecodeContext;
#if CONFIG_FLOAT
@ -448,9 +449,6 @@ static av_cold int decode_init(AVCodecContext * avctx)
if (avctx->codec_id == AV_CODEC_ID_MP3ADU)
s->adu_mode = 1;
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
return 0;
}
@ -1612,12 +1610,13 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples,
/* get output buffer */
if (!samples) {
s->frame.nb_samples = s->avctx->frame_size;
if ((ret = ff_get_buffer(s->avctx, &s->frame)) < 0) {
av_assert0(s->frame != NULL);
s->frame->nb_samples = s->avctx->frame_size;
if ((ret = ff_get_buffer(s->avctx, s->frame)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
samples = (OUT_INT **)s->frame.extended_data;
samples = (OUT_INT **)s->frame->extended_data;
}
/* apply the synthesis filter */
@ -1679,10 +1678,12 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr,
buf_size= s->frame_size;
}
s->frame = data;
ret = mp_decode_frame(s, NULL, buf, buf_size);
if (ret >= 0) {
s->frame->nb_samples = avctx->frame_size;
*got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
avctx->sample_rate = s->sample_rate;
//FIXME maybe move the other codec info stuff from above here too
} else {
@ -1750,6 +1751,8 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data,
s->frame_size = len;
s->frame = data;
ret = mp_decode_frame(s, NULL, buf, buf_size);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n");
@ -1757,7 +1760,6 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data,
}
*got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
return buf_size;
}
@ -1769,7 +1771,6 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data,
* Context for MP3On4 decoder
*/
typedef struct MP3On4DecodeContext {
AVFrame *frame;
int frames; ///< number of mp3 frames per block (number of mp3 decoder instances)
int syncword; ///< syncword patch
const uint8_t *coff; ///< channel offsets in output buffer
@ -1858,7 +1859,6 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
// Put decoder context in place to make init_decode() happy
avctx->priv_data = s->mp3decctx[0];
decode_init(avctx);
s->frame = avctx->coded_frame;
// Restore mp3on4 context pointer
avctx->priv_data = s;
s->mp3decctx[0]->adu_mode = 1; // Set adu mode
@ -1895,6 +1895,7 @@ static void flush_mp3on4(AVCodecContext *avctx)
static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MP3On4DecodeContext *s = avctx->priv_data;
@ -1906,12 +1907,12 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
int fr, ch, ret;
/* get output buffer */
s->frame->nb_samples = MPA_FRAME_SIZE;
if ((ret = ff_get_buffer(avctx, s->frame)) < 0) {
frame->nb_samples = MPA_FRAME_SIZE;
if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
out_samples = (OUT_INT **)s->frame->extended_data;
out_samples = (OUT_INT **)frame->extended_data;
// Discard too short frames
if (buf_size < HEADER_SIZE)
@ -1961,9 +1962,8 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
/* update codec info */
avctx->sample_rate = s->mp3decctx[0]->sample_rate;
s->frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
*got_frame_ptr = 1;
*(AVFrame *)data = *s->frame;
return buf_size;
}