comparison ac3dec.c @ 6031:9d3f52380cb3 libavcodec

Revert commit made in revision 11228. I'm getting some strange results in the downmixed output that I can't quite figure out.

6030:fb99890ee609

}

/**
 * Downmix the output to mono or stereo.
 */
static void ac3_downmix(float samples[][256], int fbw_channels,
                        int output_mode, float coef[AC3_MAX_CHANNELS][2],
                        int ch_offset)
{
    int i, j;
    float v0, v1, s0, s1;

    for(i=0; i<256; i++) {
        v0 = v1 = s0 = s1 = 0.0f;
        for(j=ch_offset; j<fbw_channels+ch_offset; j++) {
            v0 += samples[j][i] * coef[j-ch_offset][0];
            v1 += samples[j][i] * coef[j-ch_offset][1];
            s0 += coef[j-ch_offset][0];
            s1 += coef[j-ch_offset][1];
        }
        v0 /= s0;
        v1 /= s1;
        if(output_mode == AC3_CHMODE_MONO) {
            samples[ch_offset][i] = (v0 + v1) * LEVEL_MINUS_3DB;
        } else if(output_mode == AC3_CHMODE_STEREO) {
            samples[ch_offset][i] = v0;
            samples[ch_offset+1][i] = v1;
        }
    }
}

/**

    int fbw_channels = ctx->fbw_channels;
    int channel_mode = ctx->channel_mode;
    int i, bnd, seg, ch;
    GetBitContext *gb = &ctx->gb;
    uint8_t bit_alloc_stages[AC3_MAX_CHANNELS];
    int any_block_switching = 0;
    int num_channels_bak, fbw_channels_bak;

    memset(bit_alloc_stages, 0, AC3_MAX_CHANNELS);

    /* block switch flags */
    for (ch = 1; ch <= fbw_channels; ch++) {
        ctx->block_switch[ch] = get_bits1(gb);
        any_block_switching |= ctx->block_switch[ch];
    }

    /* dithering flags */
    ctx->dither_all = 1;
    for (ch = 1; ch <= fbw_channels; ch++) {
        ctx->dither_flag[ch] = get_bits1(gb);

        for(i=0; i<ctx->end_freq[ch]; i++) {
            ctx->transform_coeffs[ch][i] *= gain;
        }
    }

    /* if no block switching is used, downmixing can be done before IMDCT */
    num_channels_bak = ctx->channels;
    fbw_channels_bak = ctx->fbw_channels;
    if(!any_block_switching) {
        if(ctx->channels != ctx->out_channels && !((ctx->output_mode & AC3_OUTPUT_LFEON) &&
                ctx->fbw_channels == ctx->out_channels)) {
            ac3_downmix(ctx->transform_coeffs, ctx->fbw_channels,
                        ctx->output_mode, ctx->downmix_coeffs, 1);
            ctx->channels = ctx->out_channels;
            ctx->fbw_channels = ctx->channels - (ctx->output_mode & AC3_OUTPUT_LFEON);
        }
    }

    do_imdct(ctx);

    /* downmix output now if it wasn't done before IMDCT */
    if(ctx->channels != ctx->out_channels && !((ctx->output_mode & AC3_OUTPUT_LFEON) &&
            ctx->fbw_channels == ctx->out_channels)) {
        ac3_downmix(ctx->output, ctx->fbw_channels, ctx->output_mode,
                    ctx->downmix_coeffs, 0);
    }

    /* convert float to 16-bit integer */
    for(ch=0; ch<ctx->out_channels; ch++) {
        for(i=0; i<256; i++) {
            ctx->output[ch][i] += ctx->add_bias;
        }
        ctx->dsp.float_to_int16(ctx->int_output[ch], ctx->output[ch], 256);
    }

    ctx->channels = num_channels_bak;
    ctx->fbw_channels = fbw_channels_bak;

    return 0;
}

/**

6031:9d3f52380cb3

}

/**
 * Downmix the output to mono or stereo.
 */
static void ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int fbw_channels,
                        int output_mode, float coef[AC3_MAX_CHANNELS][2])
{
    int i, j;
    float v0, v1, s0, s1;

    for(i=0; i<256; i++) {
        v0 = v1 = s0 = s1 = 0.0f;
        for(j=0; j<fbw_channels; j++) {
            v0 += samples[j][i] * coef[j][0];
            v1 += samples[j][i] * coef[j][1];
            s0 += coef[j][0];
            s1 += coef[j][1];
        }
        v0 /= s0;
        v1 /= s1;
        if(output_mode == AC3_CHMODE_MONO) {
            samples[0][i] = (v0 + v1) * LEVEL_MINUS_3DB;
        } else if(output_mode == AC3_CHMODE_STEREO) {
            samples[0][i] = v0;
            samples[1][i] = v1;
        }
    }
}

/**

    int fbw_channels = ctx->fbw_channels;
    int channel_mode = ctx->channel_mode;
    int i, bnd, seg, ch;
    GetBitContext *gb = &ctx->gb;
    uint8_t bit_alloc_stages[AC3_MAX_CHANNELS];

    memset(bit_alloc_stages, 0, AC3_MAX_CHANNELS);

    /* block switch flags */
    for (ch = 1; ch <= fbw_channels; ch++)
        ctx->block_switch[ch] = get_bits1(gb);

    /* dithering flags */
    ctx->dither_all = 1;
    for (ch = 1; ch <= fbw_channels; ch++) {
        ctx->dither_flag[ch] = get_bits1(gb);

        for(i=0; i<ctx->end_freq[ch]; i++) {
            ctx->transform_coeffs[ch][i] *= gain;
        }
    }

    do_imdct(ctx);

    /* downmix output if needed */
    if(ctx->channels != ctx->out_channels && !((ctx->output_mode & AC3_OUTPUT_LFEON) &&
            ctx->fbw_channels == ctx->out_channels)) {
        ac3_downmix(ctx->output, ctx->fbw_channels, ctx->output_mode,
                    ctx->downmix_coeffs);
    }

    /* convert float to 16-bit integer */
    for(ch=0; ch<ctx->out_channels; ch++) {
        for(i=0; i<256; i++) {
            ctx->output[ch][i] += ctx->add_bias;
        }
        ctx->dsp.float_to_int16(ctx->int_output[ch], ctx->output[ch], 256);
    }

    return 0;
}

/**