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

wmavoice: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 20:29:44 -05:00
parent 205a95f7b5
commit 5a7288822f
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/wmavoice.c
View File

@ -136,7 +136,6 @@ typedef struct {
* @name Global values specified in the stream header / extradata or used all over. * @name Global values specified in the stream header / extradata or used all over.
* @{ * @{
*/ */
AVFrame frame;
GetBitContext gb; ///< packet bitreader. During decoder init, GetBitContext gb; ///< packet bitreader. During decoder init,
///< it contains the extradata from the ///< it contains the extradata from the
///< demuxer. During decoding, it contains ///< demuxer. During decoding, it contains
@ -445,9 +444,6 @@ static av_cold int wmavoice_decode_init(AVCodecContext *ctx)
ctx->channel_layout = AV_CH_LAYOUT_MONO; ctx->channel_layout = AV_CH_LAYOUT_MONO;
ctx->sample_fmt = AV_SAMPLE_FMT_FLT; ctx->sample_fmt = AV_SAMPLE_FMT_FLT;
avcodec_get_frame_defaults(&s->frame);
ctx->coded_frame = &s->frame;
return 0; return 0;
} }
@ -1735,7 +1731,8 @@ static int check_bits_for_superframe(GetBitContext *orig_gb,
* @return 0 on success, <0 on error or 1 if there was not enough data to * @return 0 on success, <0 on error or 1 if there was not enough data to
* fully parse the superframe * fully parse the superframe
*/ */
static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr) static int synth_superframe(AVCodecContext *ctx, AVFrame *frame,
int *got_frame_ptr)
{ {
WMAVoiceContext *s = ctx->priv_data; WMAVoiceContext *s = ctx->priv_data;
GetBitContext *gb = &s->gb, s_gb; GetBitContext *gb = &s->gb, s_gb;
@ -1803,13 +1800,13 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr)
} }
/* get output buffer */ /* get output buffer */
s->frame.nb_samples = 480; frame->nb_samples = 480;
if ((res = ff_get_buffer(ctx, &s->frame)) < 0) { if ((res = ff_get_buffer(ctx, frame)) < 0) {
av_log(ctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(ctx, AV_LOG_ERROR, "get_buffer() failed\n");
return res; return res;
} }
s->frame.nb_samples = n_samples; frame->nb_samples = n_samples;
samples = (float *)s->frame.data[0]; samples = (float *)frame->data[0];
/* Parse frames, optionally preceded by per-frame (independent) LSPs. */ /* Parse frames, optionally preceded by per-frame (independent) LSPs. */
for (n = 0; n < 3; n++) { for (n = 0; n < 3; n++) {
@ -1966,11 +1963,10 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
s->sframe_cache_size += s->spillover_nbits; s->sframe_cache_size += s->spillover_nbits;
if ((res = synth_superframe(ctx, got_frame_ptr)) == 0 && if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 &&
*got_frame_ptr) { *got_frame_ptr) {
cnt += s->spillover_nbits; cnt += s->spillover_nbits;
s->skip_bits_next = cnt & 7; s->skip_bits_next = cnt & 7;
*(AVFrame *)data = s->frame;
return cnt >> 3; return cnt >> 3;
} else } else
skip_bits_long (gb, s->spillover_nbits - cnt + skip_bits_long (gb, s->spillover_nbits - cnt +
@ -1985,12 +1981,11 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
s->sframe_cache_size = 0; s->sframe_cache_size = 0;
s->skip_bits_next = 0; s->skip_bits_next = 0;
pos = get_bits_left(gb); pos = get_bits_left(gb);
if ((res = synth_superframe(ctx, got_frame_ptr)) < 0) { if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) {
return res; return res;
} else if (*got_frame_ptr) { } else if (*got_frame_ptr) {
int cnt = get_bits_count(gb); int cnt = get_bits_count(gb);
s->skip_bits_next = cnt & 7; s->skip_bits_next = cnt & 7;
*(AVFrame *)data = s->frame;
return cnt >> 3; return cnt >> 3;
} else if ((s->sframe_cache_size = pos) > 0) { } else if ((s->sframe_cache_size = pos) > 0) {
/* rewind bit reader to start of last (incomplete) superframe... */ /* rewind bit reader to start of last (incomplete) superframe... */