comparison vorbis_dec.c @ 12050:a3fe680377aa libavcodec

vorbisdec: remove variable-length arrays

12049:e6305257ceb6

    uint_fast32_t partition_size;
    uint_fast8_t  classifications;
    uint_fast8_t  classbook;
    int_fast16_t  books[64][8];
    uint_fast8_t  maxpass;
} vorbis_residue;

typedef struct {
    uint_fast8_t  submaps;
    uint_fast16_t coupling_steps;

    av_freep(&vc->channel_residues);
    av_freep(&vc->channel_floors);
    av_freep(&vc->saved);

    av_freep(&vc->residues);
    av_freep(&vc->modes);

    ff_mdct_end(&vc->mdct[0]);
    ff_mdct_end(&vc->mdct[1]);

{
    uint_fast16_t cb;
    uint8_t  *tmp_vlc_bits;
    uint32_t *tmp_vlc_codes;
    GetBitContext *gb = &vc->gb;

    vc->codebook_count = get_bits(gb, 8) + 1;

    AV_DEBUG(" Codebooks: %d \n", vc->codebook_count);

    vc->codebooks = av_mallocz(vc->codebook_count * sizeof(vorbis_codebook));
    tmp_vlc_bits  = av_mallocz(V_MAX_VLCS * sizeof(uint8_t));
    tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(uint32_t));

    for (cb = 0; cb < vc->codebook_count; ++cb) {
        vorbis_codebook *codebook_setup = &vc->codebooks[cb];
        uint_fast8_t ordered;
        uint_fast32_t t, used_entries = 0;

// If the codebook is used for (inverse) VQ, calculate codevectors.

        if (codebook_setup->lookup_type == 1) {
            uint_fast16_t i, j, k;
            uint_fast16_t codebook_lookup_values = ff_vorbis_nth_root(entries, codebook_setup->dimensions);
            uint_fast16_t codebook_multiplicands[codebook_lookup_values];

            float codebook_minimum_value = vorbisfloat2float(get_bits_long(gb, 32));
            float codebook_delta_value   = vorbisfloat2float(get_bits_long(gb, 32));
            uint_fast8_t codebook_value_bits = get_bits(gb, 4)+1;
            uint_fast8_t codebook_sequence_p = get_bits1(gb);

        }
    }

    av_free(tmp_vlc_bits);
    av_free(tmp_vlc_codes);
    return 0;

// Error:
error:
    av_free(tmp_vlc_bits);
    av_free(tmp_vlc_codes);
    return -1;
}

// Process time domain transforms part (unused in Vorbis I)

        }

        res_setup->classifications = get_bits(gb, 6) + 1;
        GET_VALIDATED_INDEX(res_setup->classbook, 8, vc->codebook_count)

        AV_DEBUG("    begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
          res_setup->classifications, res_setup->classbook);

        for (j = 0; j < res_setup->classifications; ++j) {
            high_bits = 0;

{
    vorbis_floor1 *vf = &vfu->t1;
    GetBitContext *gb = &vc->gb;
    uint_fast16_t range_v[4] = { 256, 128, 86, 64 };
    uint_fast16_t range = range_v[vf->multiplier-1];
    uint_fast16_t floor1_Y[vf->x_list_dim];
    uint_fast16_t floor1_Y_final[vf->x_list_dim];
    int floor1_flag[vf->x_list_dim];
    uint_fast8_t class_;
    uint_fast8_t cdim;
    uint_fast8_t cbits;
    uint_fast8_t csub;
    uint_fast8_t cval;

                                                           uint_fast16_t vlen,
                                                           int vr_type)
{
    GetBitContext *gb = &vc->gb;
    uint_fast8_t c_p_c = vc->codebooks[vr->classbook].dimensions;
    uint_fast16_t n_to_read = vr->end-vr->begin;
    uint_fast16_t ptns_to_read = n_to_read/vr->partition_size;
    uint_fast8_t classifs[ptns_to_read*vc->audio_channels];
    uint_fast8_t pass;
    uint_fast8_t ch_used;
    uint_fast8_t i,j,l;
    uint_fast16_t k;

    uint_fast8_t previous_window = vc->previous_window;
    uint_fast8_t mode_number;
    uint_fast8_t blockflag;
    uint_fast16_t blocksize;
    int_fast32_t i,j;
    uint_fast8_t no_residue[vc->audio_channels];
    uint_fast8_t do_not_decode[vc->audio_channels];
    vorbis_mapping *mapping;
    float *ch_res_ptr   = vc->channel_residues;
    float *ch_floor_ptr = vc->channel_floors;
    uint_fast8_t res_chan[vc->audio_channels];
    uint_fast8_t res_num = 0;
    int_fast16_t retlen  = 0;
    float fadd_bias = vc->add_bias;

    if (get_bits1(gb)) {

{
    const uint8_t *buf = avpkt->data;
    int buf_size       = avpkt->size;
    vorbis_context *vc = avccontext->priv_data ;
    GetBitContext *gb = &(vc->gb);
    const float *channel_ptrs[vc->audio_channels];
    int i;

    int_fast16_t len;

    if (!buf_size)

12050:a3fe680377aa

    uint_fast32_t partition_size;
    uint_fast8_t  classifications;
    uint_fast8_t  classbook;
    int_fast16_t  books[64][8];
    uint_fast8_t  maxpass;
    uint_fast16_t ptns_to_read;
    uint_fast8_t *classifs;
} vorbis_residue;

typedef struct {
    uint_fast8_t  submaps;
    uint_fast16_t coupling_steps;

    av_freep(&vc->channel_residues);
    av_freep(&vc->channel_floors);
    av_freep(&vc->saved);

    for (i = 0; i < vc->residue_count; i++)
        av_free(vc->residues[i].classifs);
    av_freep(&vc->residues);
    av_freep(&vc->modes);

    ff_mdct_end(&vc->mdct[0]);
    ff_mdct_end(&vc->mdct[1]);

{
    uint_fast16_t cb;
    uint8_t  *tmp_vlc_bits;
    uint32_t *tmp_vlc_codes;
    GetBitContext *gb = &vc->gb;
    uint_fast16_t *codebook_multiplicands;

    vc->codebook_count = get_bits(gb, 8) + 1;

    AV_DEBUG(" Codebooks: %d \n", vc->codebook_count);

    vc->codebooks = av_mallocz(vc->codebook_count * sizeof(vorbis_codebook));
    tmp_vlc_bits  = av_mallocz(V_MAX_VLCS * sizeof(uint8_t));
    tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(uint32_t));
    codebook_multiplicands = av_malloc(V_MAX_VLCS * sizeof(*codebook_multiplicands));

    for (cb = 0; cb < vc->codebook_count; ++cb) {
        vorbis_codebook *codebook_setup = &vc->codebooks[cb];
        uint_fast8_t ordered;
        uint_fast32_t t, used_entries = 0;

// If the codebook is used for (inverse) VQ, calculate codevectors.

        if (codebook_setup->lookup_type == 1) {
            uint_fast16_t i, j, k;
            uint_fast16_t codebook_lookup_values = ff_vorbis_nth_root(entries, codebook_setup->dimensions);

            float codebook_minimum_value = vorbisfloat2float(get_bits_long(gb, 32));
            float codebook_delta_value   = vorbisfloat2float(get_bits_long(gb, 32));
            uint_fast8_t codebook_value_bits = get_bits(gb, 4)+1;
            uint_fast8_t codebook_sequence_p = get_bits1(gb);

        }
    }

    av_free(tmp_vlc_bits);
    av_free(tmp_vlc_codes);
    av_free(codebook_multiplicands);
    return 0;

// Error:
error:
    av_free(tmp_vlc_bits);
    av_free(tmp_vlc_codes);
    av_free(codebook_multiplicands);
    return -1;
}

// Process time domain transforms part (unused in Vorbis I)

        }

        res_setup->classifications = get_bits(gb, 6) + 1;
        GET_VALIDATED_INDEX(res_setup->classbook, 8, vc->codebook_count)

        res_setup->ptns_to_read =
            (res_setup->end - res_setup->begin) / res_setup->partition_size;
        res_setup->classifs = av_malloc(res_setup->ptns_to_read *
                                        vc->audio_channels *
                                        sizeof(*res_setup->classifs));

        AV_DEBUG("    begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
          res_setup->classifications, res_setup->classbook);

        for (j = 0; j < res_setup->classifications; ++j) {
            high_bits = 0;

{
    vorbis_floor1 *vf = &vfu->t1;
    GetBitContext *gb = &vc->gb;
    uint_fast16_t range_v[4] = { 256, 128, 86, 64 };
    uint_fast16_t range = range_v[vf->multiplier-1];
    uint_fast16_t floor1_Y[258];
    uint_fast16_t floor1_Y_final[258];
    int floor1_flag[258];
    uint_fast8_t class_;
    uint_fast8_t cdim;
    uint_fast8_t cbits;
    uint_fast8_t csub;
    uint_fast8_t cval;

                                                           uint_fast16_t vlen,
                                                           int vr_type)
{
    GetBitContext *gb = &vc->gb;
    uint_fast8_t c_p_c = vc->codebooks[vr->classbook].dimensions;
    uint_fast16_t ptns_to_read = vr->ptns_to_read;
    uint_fast8_t *classifs = vr->classifs;
    uint_fast8_t pass;
    uint_fast8_t ch_used;
    uint_fast8_t i,j,l;
    uint_fast16_t k;

    uint_fast8_t previous_window = vc->previous_window;
    uint_fast8_t mode_number;
    uint_fast8_t blockflag;
    uint_fast16_t blocksize;
    int_fast32_t i,j;
    uint_fast8_t no_residue[255];
    uint_fast8_t do_not_decode[255];
    vorbis_mapping *mapping;
    float *ch_res_ptr   = vc->channel_residues;
    float *ch_floor_ptr = vc->channel_floors;
    uint_fast8_t res_chan[255];
    uint_fast8_t res_num = 0;
    int_fast16_t retlen  = 0;
    float fadd_bias = vc->add_bias;

    if (get_bits1(gb)) {

{
    const uint8_t *buf = avpkt->data;
    int buf_size       = avpkt->size;
    vorbis_context *vc = avccontext->priv_data ;
    GetBitContext *gb = &(vc->gb);
    const float *channel_ptrs[255];
    int i;

    int_fast16_t len;

    if (!buf_size)