RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 15:53:08 +00:00
Code Issues Projects Releases Wiki Activity

also support decoding of AVPackets with multiple wma packets

Browse Source 
fixes issue 2539

Originally committed as revision 26346 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Sascha Sommer 2011-01-14 23:58:55 +00:00
parent 65344775b8
commit 3cdf69eefa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/wmaprodec.c
View File

@ -1,7 +1,7 @@
/* /*
* Wmapro compatible decoder * Wmapro compatible decoder
* Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion * Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion
* Copyright (c) 2008 - 2009 Sascha Sommer, Benjamin Larsson * Copyright (c) 2008 - 2011 Sascha Sommer, Benjamin Larsson
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
@ -191,6 +191,7 @@ typedef struct WMAProDecodeCtx {
/* packet decode state */ /* packet decode state */
GetBitContext pgb; ///< bitstream reader context for the packet GetBitContext pgb; ///< bitstream reader context for the packet
int next_packet_start; ///< start offset of the next wma packet in the demuxer packet
uint8_t packet_offset; ///< frame offset in the packet uint8_t packet_offset; ///< frame offset in the packet
uint8_t packet_sequence_number; ///< current packet number uint8_t packet_sequence_number; ///< current packet number
int num_saved_bits; ///< saved number of bits int num_saved_bits; ///< saved number of bits
@ -1476,13 +1477,14 @@ static int decode_packet(AVCodecContext *avctx,
if (s->packet_done || s->packet_loss) { if (s->packet_done || s->packet_loss) {
s->packet_done = 0; s->packet_done = 0;
s->buf_bit_size = buf_size << 3;
/** sanity check for the buffer length */ /** sanity check for the buffer length */
if (buf_size < avctx->block_align) if (buf_size < avctx->block_align)
return 0; return 0;
s->next_packet_start = buf_size - avctx->block_align;
buf_size = avctx->block_align; buf_size = avctx->block_align;
s->buf_bit_size = buf_size << 3;
/** parse packet header */ /** parse packet header */
init_get_bits(gb, buf, s->buf_bit_size); init_get_bits(gb, buf, s->buf_bit_size);
@ -1528,7 +1530,7 @@ static int decode_packet(AVCodecContext *avctx,
} else { } else {
int frame_size; int frame_size;
s->buf_bit_size = avpkt->size << 3; s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3;
init_get_bits(gb, avpkt->data, s->buf_bit_size); init_get_bits(gb, avpkt->data, s->buf_bit_size);
skip_bits(gb, s->packet_offset); skip_bits(gb, s->packet_offset);
if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size && if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size &&