comparison ac3dec.c @ 7011:77f607fb4e8b libavcodec

get the number of blocks from the ac3 parser and use in the ac3 decoder.

7010:942e0bd99179

#define CPL_CH 0

#define AC3_OUTPUT_LFEON  8

typedef struct {
    int channel_mode;                       ///< channel mode (acmod)
    int block_switch[AC3_MAX_CHANNELS];     ///< block switch flags
    int dither_flag[AC3_MAX_CHANNELS];      ///< dither flags
    int dither_all;                         ///< true if all channels are dithered
    int cpl_in_use;                         ///< coupling in use

    s->fbw_channels                 = s->channels - s->lfe_on;
    s->lfe_ch                       = s->fbw_channels + 1;
    s->frame_size                   = hdr.frame_size;
    s->center_mix_level             = hdr.center_mix_level;
    s->surround_mix_level           = hdr.surround_mix_level;

    if(s->lfe_on) {
        s->start_freq[s->lfe_ch] = 0;
        s->end_freq[s->lfe_ch] = 7;
        s->num_exp_groups[s->lfe_ch] = 2;

        if(s->out_channels < s->channels)
            s->output_mode  = s->out_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
    }

    /* parse the audio blocks */
    for (blk = 0; blk < NB_BLOCKS; blk++) {
        if (!err && ac3_parse_audio_block(s, blk)) {
            av_log(avctx, AV_LOG_ERROR, "error parsing the audio block\n");
        }

        /* interleave output samples */
        for (i = 0; i < 256; i++)
            for (ch = 0; ch < s->out_channels; ch++)
                *(out_samples++) = s->int_output[ch][i];
    }
    *data_size = NB_BLOCKS * 256 * avctx->channels * sizeof (int16_t);
    return s->frame_size;
}

/**
 * Uninitialize the AC-3 decoder.

7011:77f607fb4e8b

#define CPL_CH 0

#define AC3_OUTPUT_LFEON  8

typedef struct {
    int num_blocks;                         ///< number of audio blocks
    int channel_mode;                       ///< channel mode (acmod)
    int block_switch[AC3_MAX_CHANNELS];     ///< block switch flags
    int dither_flag[AC3_MAX_CHANNELS];      ///< dither flags
    int dither_all;                         ///< true if all channels are dithered
    int cpl_in_use;                         ///< coupling in use

    s->fbw_channels                 = s->channels - s->lfe_on;
    s->lfe_ch                       = s->fbw_channels + 1;
    s->frame_size                   = hdr.frame_size;
    s->center_mix_level             = hdr.center_mix_level;
    s->surround_mix_level           = hdr.surround_mix_level;
    s->num_blocks                   = hdr.num_blocks;

    if(s->lfe_on) {
        s->start_freq[s->lfe_ch] = 0;
        s->end_freq[s->lfe_ch] = 7;
        s->num_exp_groups[s->lfe_ch] = 2;

        if(s->out_channels < s->channels)
            s->output_mode  = s->out_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
    }

    /* parse the audio blocks */
    for (blk = 0; blk < s->num_blocks; blk++) {
        if (!err && ac3_parse_audio_block(s, blk)) {
            av_log(avctx, AV_LOG_ERROR, "error parsing the audio block\n");
        }

        /* interleave output samples */
        for (i = 0; i < 256; i++)
            for (ch = 0; ch < s->out_channels; ch++)
                *(out_samples++) = s->int_output[ch][i];
    }
    *data_size = s->num_blocks * 256 * avctx->channels * sizeof (int16_t);
    return s->frame_size;
}

/**
 * Uninitialize the AC-3 decoder.