diff options
Diffstat (limited to 'libavcodec/metasound.c')
| -rw-r--r-- | libavcodec/metasound.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 4cd9051dbd..87cd7cb211 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -4,20 +4,20 @@ * based on TwinVQ decoder * Copyright (c) 2009 Vitor Sessak * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -30,8 +30,8 @@ #define BITSTREAM_READER_LE #include "avcodec.h" -#include "bitstream.h" #include "fft.h" +#include "get_bits.h" #include "internal.h" #include "lsp.h" #include "sinewin.h" @@ -149,7 +149,7 @@ static void dec_bark_env(TwinVQContext *tctx, const uint8_t *in, int use_hist, } } -static void read_cb_data(TwinVQContext *tctx, BitstreamContext *bc, +static void read_cb_data(TwinVQContext *tctx, GetBitContext *gb, uint8_t *dst, enum TwinVQFrameType ftype) { int i; @@ -157,8 +157,8 @@ static void read_cb_data(TwinVQContext *tctx, BitstreamContext *bc, for (i = 0; i < tctx->n_div[ftype]; i++) { int bs_second_part = (i >= tctx->bits_main_spec_change[ftype]); - *dst++ = bitstream_read(bc, tctx->bits_main_spec[0][ftype][bs_second_part]); - *dst++ = bitstream_read(bc, tctx->bits_main_spec[1][ftype][bs_second_part]); + *dst++ = get_bits(gb, tctx->bits_main_spec[0][ftype][bs_second_part]); + *dst++ = get_bits(gb, tctx->bits_main_spec[1][ftype][bs_second_part]); } } @@ -169,16 +169,17 @@ static int metasound_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx, const TwinVQModeTab *mtab = tctx->mtab; int channels = tctx->avctx->channels; int sub; - BitstreamContext bc; - int i, j, k; + GetBitContext gb; + int i, j, k, ret; - bitstream_init8(&bc, buf, buf_size); + if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) + return ret; for (tctx->cur_frame = 0; tctx->cur_frame < tctx->frames_per_packet; tctx->cur_frame++) { bits = tctx->bits + tctx->cur_frame; - bits->window_type = bitstream_read(&bc, TWINVQ_WINDOW_TYPE_BITS); + bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS); if (bits->window_type > 8) { av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n"); @@ -190,54 +191,54 @@ static int metasound_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx, sub = mtab->fmode[bits->ftype].sub; if (bits->ftype != TWINVQ_FT_SHORT && !tctx->is_6kbps) - bitstream_read(&bc, 2); + get_bits(&gb, 2); - read_cb_data(tctx, &bc, bits->main_coeffs, bits->ftype); + read_cb_data(tctx, &gb, bits->main_coeffs, bits->ftype); for (i = 0; i < channels; i++) for (j = 0; j < sub; j++) for (k = 0; k < mtab->fmode[bits->ftype].bark_n_coef; k++) bits->bark1[i][j][k] = - bitstream_read(&bc, mtab->fmode[bits->ftype].bark_n_bit); + get_bits(&gb, mtab->fmode[bits->ftype].bark_n_bit); for (i = 0; i < channels; i++) for (j = 0; j < sub; j++) - bits->bark_use_hist[i][j] = bitstream_read_bit(&bc); + bits->bark_use_hist[i][j] = get_bits1(&gb); if (bits->ftype == TWINVQ_FT_LONG) { for (i = 0; i < channels; i++) - bits->gain_bits[i] = bitstream_read(&bc, TWINVQ_GAIN_BITS); + bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS); } else { for (i = 0; i < channels; i++) { - bits->gain_bits[i] = bitstream_read(&bc, TWINVQ_GAIN_BITS); + bits->gain_bits[i] = get_bits(&gb, TWINVQ_GAIN_BITS); for (j = 0; j < sub; j++) bits->sub_gain_bits[i * sub + j] = - bitstream_read(&bc, TWINVQ_SUB_GAIN_BITS); + get_bits(&gb, TWINVQ_SUB_GAIN_BITS); } } for (i = 0; i < channels; i++) { - bits->lpc_hist_idx[i] = bitstream_read(&bc, mtab->lsp_bit0); - bits->lpc_idx1[i] = bitstream_read(&bc, mtab->lsp_bit1); + bits->lpc_hist_idx[i] = get_bits(&gb, mtab->lsp_bit0); + bits->lpc_idx1[i] = get_bits(&gb, mtab->lsp_bit1); for (j = 0; j < mtab->lsp_split; j++) - bits->lpc_idx2[i][j] = bitstream_read(&bc, mtab->lsp_bit2); + bits->lpc_idx2[i][j] = get_bits(&gb, mtab->lsp_bit2); } if (bits->ftype == TWINVQ_FT_LONG) { - read_cb_data(tctx, &bc, bits->ppc_coeffs, 3); + read_cb_data(tctx, &gb, bits->ppc_coeffs, 3); for (i = 0; i < channels; i++) { - bits->p_coef[i] = bitstream_read(&bc, mtab->ppc_period_bit); - bits->g_coef[i] = bitstream_read(&bc, mtab->pgain_bit); + bits->p_coef[i] = get_bits(&gb, mtab->ppc_period_bit); + bits->g_coef[i] = get_bits(&gb, mtab->pgain_bit); } } // subframes are aligned to nibbles - if (bitstream_tell(&bc) & 3) - bitstream_skip(&bc, 4 - (bitstream_tell(&bc) & 3)); + if (get_bits_count(&gb) & 3) + skip_bits(&gb, 4 - (get_bits_count(&gb) & 3)); } - return 0; + return (get_bits_count(&gb) + 7) / 8; } typedef struct MetasoundProps { |