comparison ac3dec.c @ 5454:5b497d971546 libavcodec

dither zero-bit mantissas by default. remove dithering only if it's explicitly turned off.

5453:d3a265cd395c

    int surmixlev;
    int dsurmod;

    int blksw[AC3_MAX_CHANNELS];
    int dithflag[AC3_MAX_CHANNELS];
    int cplinu;
    int chincpl[AC3_MAX_CHANNELS];
    int phsflginu;
    int cplcoe;
    uint32_t cplbndstrc;

/* Get the transform coefficients for particular channel */
static int get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_groups *m)
{
    GetBitContext *gb = &ctx->gb;
    int i, gcode, tbap, dithflag, start, end;
    uint8_t *exps;
    uint8_t *bap;
    float *coeffs;

    if (ch_index >= 0) { /* fbw channels */
        dithflag = ctx->dithflag[ch_index];
        exps = ctx->dexps[ch_index];
        bap = ctx->bap[ch_index];
        coeffs = ctx->transform_coeffs[ch_index + 1];
        start = 0;
        end = ctx->endmant[ch_index];
    } else if (ch_index == -1) {
        dithflag = 0;
        exps = ctx->dlfeexps;
        bap = ctx->lfebap;
        coeffs = ctx->transform_coeffs[0];
        start = 0;
        end = 7;
    } else {
        dithflag = 0;
        exps = ctx->dcplexps;
        bap = ctx->cplbap;
        coeffs = ctx->transform_coeffs_cpl;
        start = ctx->cplstrtmant;
        end = ctx->cplendmant;

    for (i = start; i < end; i++) {
        tbap = bap[i];
        switch (tbap) {
            case 0:
                if (!dithflag) {
                    coeffs[i] = 0;
                }
                else {
                    coeffs[i] = (av_random(&ctx->dith_state) & 0xFFFF) * LEVEL_MINUS_3DB;
                }
                break;

            case 1:
                if (m->l3ptr > 2) {
                    gcode = get_bits(gb, 5);

        }
        coeffs[i] *= scale_factors[exps[i]];
    }

    return 0;
}

/* Get the transform coefficients.
 * This function extracts the tranform coefficients form the ac3 bitstream.
 * This function is called after bit allocation is performed.

        for (i = 7; i < 256; i++) {
            ctx->transform_coeffs[0][i] = 0;
        }
    }

    return 0;
}

/**
 * Performs stereo rematrixing.

    int dynrng, chbwcod, ngrps, cplabsexp, skipl;

    for (i = 0; i < nfchans; i++) /*block switch flag */
        ctx->blksw[i] = get_bits1(gb);

    for (i = 0; i < nfchans; i++) /* dithering flag */
        ctx->dithflag[i] = get_bits1(gb);

    if (get_bits1(gb)) { /* dynamic range */
        dynrng = get_sbits(gb, 8);
        ctx->dynrng = ((((dynrng & 0x1f) | 0x20) << 13) * scale_factors[3 - (dynrng >> 5)]);
    } else if(blk == 0) {

5454:5b497d971546

    int surmixlev;
    int dsurmod;

    int blksw[AC3_MAX_CHANNELS];
    int dithflag[AC3_MAX_CHANNELS];
    int dither_all;
    int cplinu;
    int chincpl[AC3_MAX_CHANNELS];
    int phsflginu;
    int cplcoe;
    uint32_t cplbndstrc;

/* Get the transform coefficients for particular channel */
static int get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_groups *m)
{
    GetBitContext *gb = &ctx->gb;
    int i, gcode, tbap, start, end;
    uint8_t *exps;
    uint8_t *bap;
    float *coeffs;

    if (ch_index >= 0) { /* fbw channels */
        exps = ctx->dexps[ch_index];
        bap = ctx->bap[ch_index];
        coeffs = ctx->transform_coeffs[ch_index + 1];
        start = 0;
        end = ctx->endmant[ch_index];
    } else if (ch_index == -1) {
        exps = ctx->dlfeexps;
        bap = ctx->lfebap;
        coeffs = ctx->transform_coeffs[0];
        start = 0;
        end = 7;
    } else {
        exps = ctx->dcplexps;
        bap = ctx->cplbap;
        coeffs = ctx->transform_coeffs_cpl;
        start = ctx->cplstrtmant;
        end = ctx->cplendmant;

    for (i = start; i < end; i++) {
        tbap = bap[i];
        switch (tbap) {
            case 0:
                    coeffs[i] = (av_random(&ctx->dith_state) & 0xFFFF) * LEVEL_MINUS_3DB;
                break;

            case 1:
                if (m->l3ptr > 2) {
                    gcode = get_bits(gb, 5);

        }
        coeffs[i] *= scale_factors[exps[i]];
    }

    return 0;
}

/**
 * Removes random dithering from coefficients with zero-bit mantissas
 * reference: Section 7.3.4 Dither for Zero Bit Mantissas (bap=0)
 */
static void remove_dithering(AC3DecodeContext *ctx) {
    int ch, i;
    int end=0;
    float *coeffs;
    uint8_t *bap;

    for(ch=1; ch<=ctx->nfchans; ch++) {
        if(!ctx->dithflag[ch-1]) {
            coeffs = ctx->transform_coeffs[ch];
            bap = ctx->bap[ch-1];
            if(ctx->chincpl[ch-1])
                end = ctx->cplstrtmant;
            else
                end = ctx->endmant[ch-1];
            for(i=0; i<end; i++) {
                if(bap[i] == 0)
                    coeffs[i] = 0.0f;
            }
            if(ctx->chincpl[ch-1]) {
                bap = ctx->cplbap;
                for(; i<ctx->cplendmant; i++) {
                    if(bap[i] == 0)
                        coeffs[i] = 0.0f;
                }
            }
        }
    }
}

/* Get the transform coefficients.
 * This function extracts the tranform coefficients form the ac3 bitstream.
 * This function is called after bit allocation is performed.

        for (i = 7; i < 256; i++) {
            ctx->transform_coeffs[0][i] = 0;
        }
    }

    /* if any channel doesn't use dithering, zero appropriate coefficients */
    if(!ctx->dither_all)
        remove_dithering(ctx);

    return 0;
}

/**
 * Performs stereo rematrixing.

    int dynrng, chbwcod, ngrps, cplabsexp, skipl;

    for (i = 0; i < nfchans; i++) /*block switch flag */
        ctx->blksw[i] = get_bits1(gb);

    ctx->dither_all = 1;
    for (i = 0; i < nfchans; i++) { /* dithering flag */
        ctx->dithflag[i] = get_bits1(gb);
        if(!ctx->dithflag[i])
            ctx->dither_all = 0;
    }

    if (get_bits1(gb)) { /* dynamic range */
        dynrng = get_sbits(gb, 8);
        ctx->dynrng = ((((dynrng & 0x1f) | 0x20) << 13) * scale_factors[3 - (dynrng >> 5)]);
    } else if(blk == 0) {