comparison ac3dec.c @ 6091:c365f7b83133 libavcodec

cosmetics: vertical realignment after last commit

6090:b7b19fbc4746

        return err;

    /* get decoding parameters from header info */
    s->bit_alloc_params.sr_code     = hdr.sr_code;
    s->channel_mode                 = hdr.channel_mode;
    center_mix_level                  = gain_levels[center_levels[hdr.center_mix_level]];
    surround_mix_level                = gain_levels[surround_levels[hdr.surround_mix_level]];
    s->lfe_on                        = hdr.lfe_on;
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
    s->sampling_rate                = hdr.sample_rate;
    s->bit_rate                     = hdr.bit_rate;
    s->channels                     = hdr.channels;
    s->fbw_channels                 = s->channels - s->lfe_on;

    for (ch=1; ch<=channels; ch++) {
        if (s->block_switch[ch]) {
            do_imdct_256(s, ch);
        } else {
            s->imdct_512.fft.imdct_calc(&s->imdct_512, s->tmp_output,
                                          s->transform_coeffs[ch],
                                          s->tmp_imdct);
        }
        /* For the first half of the block, apply the window, add the delay
           from the previous block, and send to output */
        s->dsp.vector_fmul_add_add(s->output[ch-1], s->tmp_output,
                                     s->window, s->delay[ch-1], 0, 256, 1);
        /* For the second half of the block, apply the window and store the
           samples to delay, to be combined with the next block */
        s->dsp.vector_fmul_reverse(s->delay[ch-1], s->tmp_output+256,
                                     s->window, 256);
    }
}

/**
 * Downmix the output to mono or stereo.

    /* dynamic range */
    i = !(s->channel_mode);
    do {
        if(get_bits1(gbc)) {
            s->dynamic_range[i] = ((dynamic_range_tab[get_bits(gbc, 8)]-1.0) *
                                    s->avctx->drc_scale)+1.0;
        } else if(blk == 0) {
            s->dynamic_range[i] = 1.0f;
        }
    } while(i--);

6091:c365f7b83133

        return err;

    /* get decoding parameters from header info */
    s->bit_alloc_params.sr_code     = hdr.sr_code;
    s->channel_mode                 = hdr.channel_mode;
    center_mix_level                = gain_levels[center_levels[hdr.center_mix_level]];
    surround_mix_level              = gain_levels[surround_levels[hdr.surround_mix_level]];
    s->lfe_on                       = hdr.lfe_on;
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
    s->sampling_rate                = hdr.sample_rate;
    s->bit_rate                     = hdr.bit_rate;
    s->channels                     = hdr.channels;
    s->fbw_channels                 = s->channels - s->lfe_on;

    for (ch=1; ch<=channels; ch++) {
        if (s->block_switch[ch]) {
            do_imdct_256(s, ch);
        } else {
            s->imdct_512.fft.imdct_calc(&s->imdct_512, s->tmp_output,
                                        s->transform_coeffs[ch], s->tmp_imdct);
        }
        /* For the first half of the block, apply the window, add the delay
           from the previous block, and send to output */
        s->dsp.vector_fmul_add_add(s->output[ch-1], s->tmp_output,
                                     s->window, s->delay[ch-1], 0, 256, 1);
        /* For the second half of the block, apply the window and store the
           samples to delay, to be combined with the next block */
        s->dsp.vector_fmul_reverse(s->delay[ch-1], s->tmp_output+256,
                                   s->window, 256);
    }
}

/**
 * Downmix the output to mono or stereo.

    /* dynamic range */
    i = !(s->channel_mode);
    do {
        if(get_bits1(gbc)) {
            s->dynamic_range[i] = ((dynamic_range_tab[get_bits(gbc, 8)]-1.0) *
                                  s->avctx->drc_scale)+1.0;
        } else if(blk == 0) {
            s->dynamic_range[i] = 1.0f;
        }
    } while(i--);