aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-12-23 20:04:31 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2013-02-12 12:22:39 -0500
commit3997fef95262e1138bade4cc109176a05ecc0b6e (patch)
treea5fddf68f03e36c97f625c2f3fe15e02b49a634c
parent4a2b26fc1b1ad123eba473a20e270f2b0ba92bca (diff)
downloadffmpeg-3997fef95262e1138bade4cc109176a05ecc0b6e.tar.gz
truespeech: decode directly to the user-provided AVFrame
-rw-r--r--libavcodec/truespeech.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 486e41f895..73f2de917f 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -36,7 +36,6 @@
* TrueSpeech decoder context
*/
typedef struct {
- AVFrame frame;
DSPContext dsp;
/* input data */
DECLARE_ALIGNED(16, uint8_t, buffer)[32];
@@ -73,9 +72,6 @@ static av_cold int truespeech_decode_init(AVCodecContext * avctx)
ff_dsputil_init(&c->dsp, avctx);
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
return 0;
}
@@ -310,6 +306,7 @@ static void truespeech_save_prevvec(TSContext *c)
static int truespeech_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
+ AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
TSContext *c = avctx->priv_data;
@@ -327,12 +324,12 @@ static int truespeech_decode_frame(AVCodecContext *avctx, void *data,
}
/* get output buffer */
- c->frame.nb_samples = iterations * 240;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = iterations * 240;
+ if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- samples = (int16_t *)c->frame.data[0];
+ samples = (int16_t *)frame->data[0];
memset(samples, 0, iterations * 240 * sizeof(*samples));
@@ -354,8 +351,7 @@ static int truespeech_decode_frame(AVCodecContext *avctx, void *data,
truespeech_save_prevvec(c);
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
return buf_size;
}