---
libavcodec/mpegaudiodec.c | 55 +++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index fda0280..e5db694 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -83,7 +83,6 @@ typedef struct MPADecodeContext {
AVCodecContext* avctx;
MPADSPContext mpadsp;
DSPContext dsp;
- AVFrame frame;
} MPADecodeContext;
#if CONFIG_FLOAT
@@ -447,9 +446,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;
}
@@ -1556,7 +1552,7 @@ static int mp_decode_layer3(MPADecodeContext *s)
static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples,
const uint8_t *buf, int buf_size)
{
- int i, nb_frames, ch, ret;
+ int i, nb_frames, ch;
OUT_INT *samples_ptr;
init_get_bits(&s->gb, buf + HEADER_SIZE, (buf_size - HEADER_SIZE) * 8);
@@ -1609,16 +1605,6 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT
**samples,
s->last_buf_size += i;
}
- /* get output buffer */
- if (!samples) {
- 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;
- }
-
/* apply the synthesis filter */
for (ch = 0; ch < s->nb_channels; ch++) {
int sample_stride;
@@ -1648,6 +1634,7 @@ static int decode_frame(AVCodecContext * avctx, void
*data, int *got_frame_ptr,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MPADecodeContext *s = avctx->priv_data;
+ AVFrame *frame = data;
uint32_t header;
int ret;
@@ -1678,10 +1665,16 @@ static int decode_frame(AVCodecContext * avctx, void
*data, int *got_frame_ptr,
buf_size= s->frame_size;
}
- ret = mp_decode_frame(s, NULL, buf, buf_size);
+ frame->nb_samples = MPA_FRAME_SIZE;
+ if ((ret = ff_get_buffer(s->avctx, frame)) < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ ret = mp_decode_frame(s, (OUT_INT **)frame->extended_data, buf, buf_size);
if (ret >= 0) {
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ frame->nb_samples = avctx->frame_size;
+ *got_frame_ptr = 1;
avctx->sample_rate = s->sample_rate;
//FIXME maybe move the other codec info stuff from above here too
} else {
@@ -1717,6 +1710,7 @@ static int decode_frame_adu(AVCodecContext *avctx, void
*data,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MPADecodeContext *s = avctx->priv_data;
+ AVFrame *frame = data;
uint32_t header;
int len, ret;
@@ -1749,14 +1743,19 @@ static int decode_frame_adu(AVCodecContext *avctx, void
*data,
s->frame_size = len;
- ret = mp_decode_frame(s, NULL, buf, buf_size);
+ frame->nb_samples = MPA_FRAME_SIZE;
+ if ((ret = ff_get_buffer(s->avctx, frame)) < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ ret = mp_decode_frame(s, (OUT_INT **)frame->extended_data, buf, buf_size);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio
frame.\n");
return ret;
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
return buf_size;
}
@@ -1768,7 +1767,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
@@ -1857,7 +1855,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
@@ -1894,6 +1891,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;
@@ -1905,12 +1903,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)
@@ -1960,9 +1958,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));
- *got_frame_ptr = 1;
- *(AVFrame *)data = *s->frame;
+ frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
+ *got_frame_ptr = 1;
return buf_size;
}
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
