diff options
Diffstat (limited to 'libavcodec/wmadec.c')
| -rw-r--r-- | libavcodec/wmadec.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 50c77dd100..0d28e2a0bd 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -209,9 +209,9 @@ static void decode_exp_lsp(WMACodecContext *s, int ch) for (i = 0; i < NB_LSP_COEFS; i++) { if (i == 0 || i >= 8) - val = get_bits(&s->gb, 3); + val = bitstream_read(&s->bc, 3); else - val = get_bits(&s->gb, 4); + val = bitstream_read(&s->bc, 4); lsp_coefs[i] = ff_wma_lsp_codebook[i][val]; } @@ -318,7 +318,7 @@ static int decode_exp_vlc(WMACodecContext *s, int ch) q_end = q + s->block_len; max_scale = 0; if (s->version == 1) { - last_exp = get_bits(&s->gb, 5) + 10; + last_exp = bitstream_read(&s->bc, 5) + 10; v = ptab[last_exp]; iv = iptab[last_exp]; max_scale = v; @@ -333,7 +333,7 @@ static int decode_exp_vlc(WMACodecContext *s, int ch) last_exp = 36; while (q < q_end) { - code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); + code = bitstream_read_vlc(&s->bc, s->exp_vlc.table, EXPVLCBITS, EXPMAX); if (code < 0) { av_log(s->avctx, AV_LOG_ERROR, "Exponent vlc invalid\n"); return -1; @@ -436,7 +436,7 @@ static int wma_decode_block(WMACodecContext *s) if (s->reset_block_lengths) { s->reset_block_lengths = 0; - v = get_bits(&s->gb, n); + v = bitstream_read(&s->bc, n); if (v >= s->nb_block_sizes) { av_log(s->avctx, AV_LOG_ERROR, "prev_block_len_bits %d out of range\n", @@ -444,7 +444,7 @@ static int wma_decode_block(WMACodecContext *s) return -1; } s->prev_block_len_bits = s->frame_len_bits - v; - v = get_bits(&s->gb, n); + v = bitstream_read(&s->bc, n); if (v >= s->nb_block_sizes) { av_log(s->avctx, AV_LOG_ERROR, "block_len_bits %d out of range\n", @@ -457,7 +457,7 @@ static int wma_decode_block(WMACodecContext *s) s->prev_block_len_bits = s->block_len_bits; s->block_len_bits = s->next_block_len_bits; } - v = get_bits(&s->gb, n); + v = bitstream_read(&s->bc, n); if (v >= s->nb_block_sizes) { av_log(s->avctx, AV_LOG_ERROR, "next_block_len_bits %d out of range\n", @@ -480,10 +480,10 @@ static int wma_decode_block(WMACodecContext *s) } if (s->avctx->channels == 2) - s->ms_stereo = get_bits1(&s->gb); + s->ms_stereo = bitstream_read_bit(&s->bc); v = 0; for (ch = 0; ch < s->avctx->channels; ch++) { - a = get_bits1(&s->gb); + a = bitstream_read_bit(&s->bc); s->channel_coded[ch] = a; v |= a; } @@ -499,7 +499,7 @@ static int wma_decode_block(WMACodecContext *s) * coef escape coding */ total_gain = 1; for (;;) { - a = get_bits(&s->gb, 7); + a = bitstream_read(&s->bc, 7); total_gain += a; if (a != 127) break; @@ -519,7 +519,7 @@ static int wma_decode_block(WMACodecContext *s) int i, n, a; n = s->exponent_high_sizes[bsize]; for (i = 0; i < n; i++) { - a = get_bits1(&s->gb); + a = bitstream_read_bit(&s->bc); s->high_band_coded[ch][i] = a; /* if noise coding, the coefficients are not transmitted */ if (a) @@ -536,9 +536,9 @@ static int wma_decode_block(WMACodecContext *s) for (i = 0; i < n; i++) { if (s->high_band_coded[ch][i]) { if (val == (int) 0x80000000) { - val = get_bits(&s->gb, 7) - 19; + val = bitstream_read(&s->bc, 7) - 19; } else { - code = get_vlc2(&s->gb, s->hgain_vlc.table, + code = bitstream_read_vlc(&s->bc, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX); if (code < 0) { av_log(s->avctx, AV_LOG_ERROR, @@ -555,7 +555,7 @@ static int wma_decode_block(WMACodecContext *s) } /* exponents can be reused in short blocks. */ - if ((s->block_len_bits == s->frame_len_bits) || get_bits1(&s->gb)) { + if ((s->block_len_bits == s->frame_len_bits) || bitstream_read_bit(&s->bc)) { for (ch = 0; ch < s->avctx->channels; ch++) { if (s->channel_coded[ch]) { if (s->use_exp_vlc) { @@ -579,13 +579,13 @@ static int wma_decode_block(WMACodecContext *s) * there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); memset(ptr, 0, s->block_len * sizeof(WMACoef)); - ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], + ff_wma_run_level_decode(s->avctx, &s->bc, &s->coef_vlc[tindex], s->level_table[tindex], s->run_table[tindex], 0, ptr, 0, nb_coefs[ch], s->block_len, s->frame_len_bits, coef_nb_bits); } if (s->version == 1 && s->avctx->channels >= 2) - align_get_bits(&s->gb); + bitstream_align(&s->bc); } /* normalize */ @@ -810,12 +810,12 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, } buf_size = avctx->block_align; - init_get_bits(&s->gb, buf, buf_size * 8); + bitstream_init(&s->bc, buf, buf_size * 8); if (s->use_bit_reservoir) { /* read super frame header */ - skip_bits(&s->gb, 4); /* super frame index */ - nb_frames = get_bits(&s->gb, 4) - (s->last_superframe_len <= 0); + bitstream_skip(&s->bc, 4); /* super frame index */ + nb_frames = bitstream_read(&s->bc, 4) - (s->last_superframe_len <= 0); } else nb_frames = 1; @@ -829,11 +829,11 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, samples_offset = 0; if (s->use_bit_reservoir) { - bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3); - if (bit_offset > get_bits_left(&s->gb)) { + bit_offset = bitstream_read(&s->bc, s->byte_offset_bits + 3); + if (bit_offset > bitstream_bits_left(&s->bc)) { av_log(avctx, AV_LOG_ERROR, "Invalid last frame bit offset %d > buf size %d (%d)\n", - bit_offset, get_bits_left(&s->gb), buf_size); + bit_offset, bitstream_bits_left(&s->bc), buf_size); goto fail; } @@ -845,19 +845,19 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, q = s->last_superframe + s->last_superframe_len; len = bit_offset; while (len > 7) { - *q++ = (get_bits) (&s->gb, 8); + *q++ = (bitstream_read) (&s->bc, 8); len -= 8; } if (len > 0) - *q++ = (get_bits) (&s->gb, len) << (8 - len); + *q++ = (bitstream_read) (&s->bc, len) << (8 - len); memset(q, 0, AV_INPUT_BUFFER_PADDING_SIZE); /* XXX: bit_offset bits into last frame */ - init_get_bits(&s->gb, s->last_superframe, + bitstream_init(&s->bc, s->last_superframe, s->last_superframe_len * 8 + bit_offset); /* skip unused bits */ if (s->last_bitoffset > 0) - skip_bits(&s->gb, s->last_bitoffset); + bitstream_skip(&s->bc, s->last_bitoffset); /* this frame is stored in the last superframe and in the * current one */ if (wma_decode_frame(s, samples, samples_offset) < 0) @@ -870,10 +870,10 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3; if (pos >= MAX_CODED_SUPERFRAME_SIZE * 8 || pos > buf_size * 8) return AVERROR_INVALIDDATA; - init_get_bits(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3)) * 8); + bitstream_init(&s->bc, buf + (pos >> 3), (buf_size - (pos >> 3)) * 8); len = pos & 7; if (len > 0) - skip_bits(&s->gb, len); + bitstream_skip(&s->bc, len); s->reset_block_lengths = 1; for (i = 0; i < nb_frames; i++) { @@ -883,7 +883,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, } /* we copy the end of the frame in the last frame buffer */ - pos = get_bits_count(&s->gb) + + pos = bitstream_tell(&s->bc) + ((bit_offset + 4 + 4 + s->byte_offset_bits + 3) & ~7); s->last_bitoffset = pos & 7; pos >>= 3; |