comparison aac.c @ 8004:8fd8f23be794 libavcodec

Corrections to channel coupling code to attain conformance for appropriate streams. Slightly reworked from a patch by Alex Converse (alex converse gmail com)

8003:777ecd2f8cbe

        if (coup->type[c] == TYPE_CPE) {
            coup->ch_select[c] = get_bits(gb, 2);
            if (coup->ch_select[c] == 3)
                num_gain++;
        } else
            coup->ch_select[c] = 1;
    }
    coup->coupling_point += get_bits1(gb);

    if (coup->coupling_point == 2) {
        av_log(ac->avccontext, AV_LOG_ERROR,

        int gain = 0;
        float gain_cache = 1.;
        if (c) {
            cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb);
            gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0;
            gain_cache = pow(scale, gain);
        }
        for (g = 0; g < sce->ics.num_window_groups; g++) {
            for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
                if (sce->band_type[idx] != ZERO_BT) {
                    if (!cge) {
                        int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
                        if (t) {
                            int s = 1;
                            if (sign) {
                                s  -= 2 * (t & 0x1);
                                t >>= 1;
                            }
                            gain += t;
                            gain_cache = pow(scale, gain) * s;
                        }
                    }
                    coup->gain[c][idx] = gain_cache;
                }
            }

 *
 * @param   index   index into coupling gain array
 * @param   apply_coupling_method   pointer to (in)dependent coupling function
 */
static void apply_channel_coupling(AACContext * ac, ChannelElement * cc,
        void (*apply_coupling_method)(AACContext * ac, SingleChannelElement * sce, ChannelElement * cc, int index))
{
    int c;
    int index = 0;
    ChannelCoupling * coup = &cc->coup;
    for (c = 0; c <= coup->num_coupled; c++) {
        if (ac->che[coup->type[c]][coup->id_select[c]]) {
            if (coup->ch_select[c] != 2) {
                apply_coupling_method(ac, &ac->che[coup->type[c]][coup->id_select[c]]->ch[0], cc, index);
                if (coup->ch_select[c] != 0)
                    index++;
            }
            if (coup->ch_select[c] != 1)
                apply_coupling_method(ac, &ac->che[coup->type[c]][coup->id_select[c]]->ch[1], cc, index++);
        } else {
            av_log(ac->avccontext, AV_LOG_ERROR,
                   "coupling target %sE[%d] not available\n",
                   coup->type[c] == TYPE_CPE ? "CP" : "SC", coup->id_select[c]);
            break;
        }
    }
}

/**
 * Convert spectral data to float samples, applying all supported tools as appropriate.
 */
static void spectral_to_sample(AACContext * ac) {
    int i, type;
    for (i = 0; i < MAX_ELEM_ID; i++) {
        for(type = 0; type < 4; type++) {
            ChannelElement *che = ac->che[type][i];
            if(che) {
                if(che->coup.coupling_point == BEFORE_TNS)
                    apply_channel_coupling(ac, che, apply_dependent_coupling);
                if(che->ch[0].tns.present)
                    apply_tns(che->ch[0].coeffs, &che->ch[0].tns, &che->ch[0].ics, 1);
                if(che->ch[1].tns.present)
                    apply_tns(che->ch[1].coeffs, &che->ch[1].tns, &che->ch[1].ics, 1);
                if(che->coup.coupling_point == BETWEEN_TNS_AND_IMDCT)
                    apply_channel_coupling(ac, che, apply_dependent_coupling);
                imdct_and_windowing(ac, &che->ch[0]);
                if(type == TYPE_CPE)
                    imdct_and_windowing(ac, &che->ch[1]);
                if(che->coup.coupling_point == AFTER_IMDCT)
                    apply_channel_coupling(ac, che, apply_independent_coupling);
            }
        }
    }
}

8004:8fd8f23be794

        if (coup->type[c] == TYPE_CPE) {
            coup->ch_select[c] = get_bits(gb, 2);
            if (coup->ch_select[c] == 3)
                num_gain++;
        } else
            coup->ch_select[c] = 2;
    }
    coup->coupling_point += get_bits1(gb);

    if (coup->coupling_point == 2) {
        av_log(ac->avccontext, AV_LOG_ERROR,

        int gain = 0;
        float gain_cache = 1.;
        if (c) {
            cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb);
            gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0;
            gain_cache = pow(scale, -gain);
        }
        for (g = 0; g < sce->ics.num_window_groups; g++) {
            for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
                if (sce->band_type[idx] != ZERO_BT) {
                    if (!cge) {
                        int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
                        if (t) {
                            int s = 1;
                            t = gain += t;
                            if (sign) {
                                s  -= 2 * (t & 0x1);
                                t >>= 1;
                            }
                            gain_cache = pow(scale, -t) * s;
                        }
                    }
                    coup->gain[c][idx] = gain_cache;
                }
            }

 *
 * @param   index   index into coupling gain array
 * @param   apply_coupling_method   pointer to (in)dependent coupling function
 */
static void apply_channel_coupling(AACContext * ac, ChannelElement * cc,
        enum RawDataBlockType type, int elem_id, enum CouplingPoint coupling_point,
        void (*apply_coupling_method)(AACContext * ac, SingleChannelElement * sce, ChannelElement * cc, int index))
{
    int i, c;

    for (i = 0; i < MAX_ELEM_ID; i++) {
        ChannelElement *cce = ac->che[TYPE_CCE][i];
        int index = 0;

        if (cce && cce->coup.coupling_point == coupling_point) {
            ChannelCoupling * coup = &cce->coup;

            for (c = 0; c <= coup->num_coupled; c++) {
                if (coup->type[c] == type && coup->id_select[c] == elem_id) {
                    if (coup->ch_select[c] != 1) {
                        apply_coupling_method(ac, &cc->ch[0], cce, index);
                        if (coup->ch_select[c] != 0)
                            index++;
                    }
                    if (coup->ch_select[c] != 2)
                        apply_coupling_method(ac, &cc->ch[1], cce, index++);
                } else
                    index += 1 + (coup->ch_select[c] == 3);
            }
        }
    }
}

/**
 * Convert spectral data to float samples, applying all supported tools as appropriate.
 */
static void spectral_to_sample(AACContext * ac) {
    int i, type;
    for(type = 3; type >= 0; type--) {
        for (i = 0; i < MAX_ELEM_ID; i++) {
            ChannelElement *che = ac->che[type][i];
            if(che) {
                if(type <= TYPE_CPE)
                    apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling);
                if(che->ch[0].tns.present)
                    apply_tns(che->ch[0].coeffs, &che->ch[0].tns, &che->ch[0].ics, 1);
                if(che->ch[1].tns.present)
                    apply_tns(che->ch[1].coeffs, &che->ch[1].tns, &che->ch[1].ics, 1);
                if(type <= TYPE_CPE)
                    apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling);
                if(type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT)
                    imdct_and_windowing(ac, &che->ch[0]);
                if(type == TYPE_CPE)
                    imdct_and_windowing(ac, &che->ch[1]);
                if(type <= TYPE_CCE)
                    apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling);
            }
        }
    }
}