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

reinit get_bits for every decode_packet call

Browse Source 
Originally committed as revision 19822 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Sascha Sommer 2009-09-11 15:59:27 +00:00
parent 6fa6c481b9
commit bc7f96b184
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/wmaprodec.c
View File

@ -190,6 +190,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
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
int frame_offset; ///< frame offset in the bit reservoir int frame_offset; ///< frame offset in the bit reservoir
@ -1502,6 +1503,9 @@ static int decode_packet(AVCodecContext *avctx,
} else { } else {
int frame_size; int frame_size;
s->buf_bit_size = avpkt->size << 3;
init_get_bits(gb, avpkt->data, s->buf_bit_size);
skip_bits(gb, s->packet_offset);
if (remaining_bits(s, gb) > s->log2_frame_size && if (remaining_bits(s, gb) > s->log2_frame_size &&
(frame_size = show_bits(gb, s->log2_frame_size)) && (frame_size = show_bits(gb, s->log2_frame_size)) &&
frame_size <= remaining_bits(s, gb)) { frame_size <= remaining_bits(s, gb)) {
@ -1519,8 +1523,9 @@ static int decode_packet(AVCodecContext *avctx,
} }
*data_size = (int8_t *)s->samples - (int8_t *)data; *data_size = (int8_t *)s->samples - (int8_t *)data;
s->packet_offset = get_bits_count(gb) & 7;
return (!s->packet_done && !s->packet_loss)?0: avctx->block_align; return get_bits_count(gb) >> 3;
} }
/** /**