diff options
Diffstat (limited to 'libavcodec/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 4067dff11a..697b41b0aa 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -22,6 +22,7 @@ #include "libavutil/attributes.h" #include "avcodec.h" +#include "bitstream.h" #include "internal.h" #include "sinewin.h" #include "wma.h" @@ -382,30 +383,30 @@ int ff_wma_end(AVCodecContext *avctx) /** * Decode an uncompressed coefficient. - * @param gb GetBitContext + * @param bc BitstreamContext * @return the decoded coefficient */ -unsigned int ff_wma_get_large_val(GetBitContext *gb) +unsigned int ff_wma_get_large_val(BitstreamContext *bc) { /** consumes up to 34 bits */ int n_bits = 8; /** decode length */ - if (get_bits1(gb)) { + if (bitstream_read_bit(bc)) { n_bits += 8; - if (get_bits1(gb)) { + if (bitstream_read_bit(bc)) { n_bits += 8; - if (get_bits1(gb)) + if (bitstream_read_bit(bc)) n_bits += 7; } } - return get_bits_long(gb, n_bits); + return bitstream_read(bc, n_bits); } /** * Decode run level compressed coefficients. * @param avctx codec context - * @param gb bitstream reader context - * @param vlc vlc table for get_vlc2 + * @param bc bitstream reader context + * @param vlc VLC table for bitstream_read_vlc * @param level_table level codes * @param run_table run codes * @param version 0 for wma1,2 1 for wmapro @@ -417,7 +418,7 @@ unsigned int ff_wma_get_large_val(GetBitContext *gb) * @param coef_nb_bits number of bits for escaped level codes * @return 0 on success, -1 otherwise */ -int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, +int ff_wma_run_level_decode(AVCodecContext *avctx, BitstreamContext *bc, VLC *vlc, const float *level_table, const uint16_t *run_table, int version, WMACoef *ptr, int offset, int num_coefs, @@ -429,11 +430,11 @@ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, uint32_t *iptr = (uint32_t *) ptr; const unsigned int coef_mask = block_len - 1; for (; offset < num_coefs; offset++) { - code = get_vlc2(gb, vlc->table, VLCBITS, VLCMAX); + code = bitstream_read_vlc(bc, vlc->table, VLCBITS, VLCMAX); if (code > 1) { /** normal code */ offset += run_table[code]; - sign = get_bits1(gb) - 1; + sign = bitstream_read_bit(bc) - 1; iptr[offset & coef_mask] = ilvl[code] ^ sign << 31; } else if (code == 1) { /** EOB */ @@ -441,26 +442,26 @@ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, } else { /** escape */ if (!version) { - level = get_bits(gb, coef_nb_bits); + level = bitstream_read(bc, coef_nb_bits); /** NOTE: this is rather suboptimal. reading * block_len_bits would be better */ - offset += get_bits(gb, frame_len_bits); + offset += bitstream_read(bc, frame_len_bits); } else { - level = ff_wma_get_large_val(gb); + level = ff_wma_get_large_val(bc); /** escape decode */ - if (get_bits1(gb)) { - if (get_bits1(gb)) { - if (get_bits1(gb)) { + if (bitstream_read_bit(bc)) { + if (bitstream_read_bit(bc)) { + if (bitstream_read_bit(bc)) { av_log(avctx, AV_LOG_ERROR, "broken escape sequence\n"); return -1; } else - offset += get_bits(gb, frame_len_bits) + 4; + offset += bitstream_read(bc, frame_len_bits) + 4; } else - offset += get_bits(gb, 2) + 1; + offset += bitstream_read(bc, 2) + 1; } } - sign = get_bits1(gb) - 1; + sign = bitstream_read_bit(bc) - 1; ptr[offset & coef_mask] = (level ^ sign) - sign; } } |