comparison ac3dec.c @ 5497:377e9152aa9b libavcodec

use array for dynamic range scaling factors

5496:f966fc154841

    int      output_mode;       ///< output channel configuration
    int      out_channels;      ///< number of output channels

    float    downmix_coeffs[AC3_MAX_CHANNELS][2];   ///< stereo downmix coefficients
    float    dialnorm[2];                       ///< dialogue normalization
    float    dynrng;            //dynamic range gain
    float    dynrng2;           //dynamic range gain for 1+1 mode
    float    cplco[AC3_MAX_CHANNELS][18];   //coupling coordinates
    int      ncplbnd;           //number of coupling bands
    int      ncplsubnd;         //number of coupling sub bands
    int      startmant[AC3_MAX_CHANNELS];   ///< start frequency bin
    int      endmant[AC3_MAX_CHANNELS];     //channel end mantissas

        ctx->dithflag[ch] = get_bits1(gb);
        if(!ctx->dithflag[ch])
            ctx->dither_all = 0;
    }

    if (get_bits1(gb)) { /* dynamic range */
        ctx->dynrng = dynrng_tbl[get_bits(gb, 8)];
    } else if(blk == 0) {
        ctx->dynrng = 1.0;
    }

    if(acmod == AC3_ACMOD_DUALMONO) { /* dynamic range 1+1 mode */
        if(get_bits1(gb)) {
            ctx->dynrng2 = dynrng_tbl[get_bits(gb, 8)];
        } else if(blk == 0) {
            ctx->dynrng2 = 1.0;
        }
    }

    if (get_bits1(gb)) { /* coupling strategy */
        memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
        ctx->cplinu = get_bits1(gb);
        if (ctx->cplinu) { /* coupling in use */

        do_rematrixing(ctx);

    /* apply scaling to coefficients (headroom, dialnorm, dynrng) */
    for(ch=1; ch<=ctx->nchans; ch++) {
        float gain = 2.0f * ctx->mul_bias;
        if(ctx->acmod == AC3_ACMOD_DUALMONO && ch == 2) {
            gain *= ctx->dialnorm[ch-1] * ctx->dynrng2;
        } else {
            gain *= ctx->dialnorm[0] * ctx->dynrng;
        }
        for(i=0; i<ctx->endmant[ch]; i++) {
            ctx->transform_coeffs[ch][i] *= gain;
        }
    }

5497:377e9152aa9b

    int      output_mode;       ///< output channel configuration
    int      out_channels;      ///< number of output channels

    float    downmix_coeffs[AC3_MAX_CHANNELS][2];   ///< stereo downmix coefficients
    float    dialnorm[2];                       ///< dialogue normalization
    float    dynrng[2];                         ///< dynamic range
    float    cplco[AC3_MAX_CHANNELS][18];   //coupling coordinates
    int      ncplbnd;           //number of coupling bands
    int      ncplsubnd;         //number of coupling sub bands
    int      startmant[AC3_MAX_CHANNELS];   ///< start frequency bin
    int      endmant[AC3_MAX_CHANNELS];     //channel end mantissas

        ctx->dithflag[ch] = get_bits1(gb);
        if(!ctx->dithflag[ch])
            ctx->dither_all = 0;
    }

    /* dynamic range */
    i = !(ctx->acmod);
    do {
        if(get_bits1(gb)) {
            ctx->dynrng[i] = dynrng_tbl[get_bits(gb, 8)];
        } else if(blk == 0) {
            ctx->dynrng[i] = 1.0f;
        }
    } while(i--);

    if (get_bits1(gb)) { /* coupling strategy */
        memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
        ctx->cplinu = get_bits1(gb);
        if (ctx->cplinu) { /* coupling in use */

        do_rematrixing(ctx);

    /* apply scaling to coefficients (headroom, dialnorm, dynrng) */
    for(ch=1; ch<=ctx->nchans; ch++) {
        float gain = 2.0f * ctx->mul_bias;
        if(ctx->acmod == AC3_ACMOD_DUALMONO) {
            gain *= ctx->dialnorm[ch-1] * ctx->dynrng[ch-1];
        } else {
            gain *= ctx->dialnorm[0] * ctx->dynrng[0];
        }
        for(i=0; i<ctx->endmant[ch]; i++) {
            ctx->transform_coeffs[ch][i] *= gain;
        }
    }