comparison cook.c @ 4544:f89d4caa8d4e libavcodec

Clairyfication of the gain tool struct.

4543:d0c94a0d43ca

#define SUBBAND_SIZE    20
//#define COOKDEBUG

typedef struct {
    int     size;
    int     qidx_table1[8];
    int     qidx_table2[8];
} COOKgain;

typedef struct {
    GetBitContext       gb;
    /* stream data */

    gaininfo->size = get_bits_count(gb) - 1;     //amount of elements*2 to update

    if (get_bits_count(gb) - 1 <= 0) return;

    for (i=0 ; i<gaininfo->size ; i++){
        gaininfo->qidx_table1[i] = get_bits(gb,3);
        if (get_bits1(gb)) {
            gaininfo->qidx_table2[i] = get_bits(gb,4) - 7;  //convert to signed
        } else {
            gaininfo->qidx_table2[i] = -1;
        }
    }
}

/**

    int tmp_gain_index;

    gain_index[8]=0;
    index = gain_previous->size;
    for (i=7 ; i>=0 ; i--) {
        if(index && gain_previous->qidx_table1[index-1]==i) {
            gain_index[i] = gain_previous->qidx_table2[index-1];
            index--;
        } else {
            gain_index[i]=gain_index[i+1];
        }
    }

    }

    tmp_gain_index = gain_index[0];
    index = gain_now->size;
    for (i=7 ; i>=0 ; i--) {
        if(index && gain_now->qidx_table1[index-1]==i) {
            gain_index[i]= gain_now->qidx_table2[index-1];
            index--;
        } else {
            gain_index[i]=gain_index[i+1];
        }
    }

4544:f89d4caa8d4e

#define SUBBAND_SIZE    20
//#define COOKDEBUG

typedef struct {
    int     size;
    int     loccode[8];
    int     levcode[8];
} COOKgain;

typedef struct {
    GetBitContext       gb;
    /* stream data */

    gaininfo->size = get_bits_count(gb) - 1;     //amount of elements*2 to update

    if (get_bits_count(gb) - 1 <= 0) return;

    for (i=0 ; i<gaininfo->size ; i++){
        gaininfo->loccode[i] = get_bits(gb,3);
        if (get_bits1(gb)) {
            gaininfo->levcode[i] = get_bits(gb,4) - 7;  //convert to signed
        } else {
            gaininfo->levcode[i] = -1;
        }
    }
}

/**

    int tmp_gain_index;

    gain_index[8]=0;
    index = gain_previous->size;
    for (i=7 ; i>=0 ; i--) {
        if(index && gain_previous->loccode[index-1]==i) {
            gain_index[i] = gain_previous->levcode[index-1];
            index--;
        } else {
            gain_index[i]=gain_index[i+1];
        }
    }

    }

    tmp_gain_index = gain_index[0];
    index = gain_now->size;
    for (i=7 ; i>=0 ; i--) {
        if(index && gain_now->loccode[index-1]==i) {
            gain_index[i]= gain_now->levcode[index-1];
            index--;
        } else {
            gain_index[i]=gain_index[i+1];
        }
    }