diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-02-13 12:24:52 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-02-13 12:33:48 +0000 |
| commit | 8f7c7ff2d6050d1fe0a70e0781f6ea41d9c3071f (patch) | |
| tree | ecd6719bbb8ff8e4167db18adfab26c36674bd63 /libavcodec/evrcdec.c | |
| parent | 2cced2a85442cd70cf6ceec29aff9ab1dc7880aa (diff) | |
| download | ffmpeg-8f7c7ff2d6050d1fe0a70e0781f6ea41d9c3071f.tar.gz | |
evrcdec: decode directly to the user-provided AVFrame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/evrcdec.c')
| -rw-r--r-- | libavcodec/evrcdec.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 8795f3da96..5569ca2511 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -66,7 +66,6 @@ typedef struct EVRCAFrame { } EVRCAFrame; typedef struct EVRCContext { - AVFrame avframe; GetBitContext gb; evrc_packet_rate bitrate; evrc_packet_rate last_valid_bitrate; @@ -230,9 +229,6 @@ static av_cold int evrc_decode_init(AVCodecContext *avctx) int i, n, idx = 0; float denom = 2.0 / (2.0 * 8.0 + 1.0); - avcodec_get_frame_defaults(&e->avframe); - avctx->coded_frame = &e->avframe; - avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->sample_fmt = AV_SAMPLE_FMT_FLT; @@ -742,16 +738,17 @@ static int evrc_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; + AVFrame *frame = data; EVRCContext *e = avctx->priv_data; int buf_size = avpkt->size; float ilspf[FILTER_ORDER], ilpc[FILTER_ORDER], idelay[NB_SUBFRAMES]; float *samples; int i, j, ret, error_flag = 0; - e->avframe.nb_samples = 160; - if ((ret = ff_get_buffer(avctx, &e->avframe)) < 0) + frame->nb_samples = 160; + if ((ret = ff_get_buffer(avctx, frame)) < 0) return ret; - samples = (float *)e->avframe.data[0]; + samples = (float *)frame->data[0]; if ((e->bitrate = determine_bitrate(avctx, &buf_size, &buf)) == RATE_ERRS) { warn_insufficient_frame_quality(avctx, "bitrate cannot be determined."); @@ -899,12 +896,11 @@ erasure: if (e->bitrate != RATE_QUANT) e->prev_pitch_delay = e->pitch_delay; - samples = (float *)e->avframe.data[0]; + samples = (float *)frame->data[0]; for (i = 0; i < 160; i++) samples[i] /= 32768; *got_frame_ptr = 1; - *(AVFrame *)data = e->avframe; return avpkt->size; } |