comparison cook.c @ 4639:33fc84eae7c3 libavcodec

Simplify gain block handling. Patch by Ian Braithwaite <ian at braithwaite dot dk>

4638:9f74306d4ac7

#define SUBBAND_SIZE    20
//#define COOKDEBUG

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

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

    int                 fft_size;
    int                 fft_order;
    int                 mlt_size;       //modulated lapped transform size

    /* gain buffers */
    COOKgain            *gain_ptr1[2];
    COOKgain            *gain_ptr2[2];
    COOKgain            gain_1;
    COOKgain            gain_2;
    COOKgain            gain_3;
    COOKgain            gain_4;

    /* VLC data */
    int                 js_vlc_bits;
    VLC                 envelope_quant_index[13];
    VLC                 sqvh[7];          //scalar quantization

    return 0;
}

/**
 * Fill the COOKgain structure for the timedomain quantization.
 *
 * @param q                 pointer to the COOKContext
 * @param gaininfo          pointer to the COOKgain
 */

static void decode_gain_info(GetBitContext *gb, COOKgain* gaininfo) {
    int i;

    while (get_bits1(gb)) {}

    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;
        }
    }
}

/**
 * Create the quant index table needed for the envelope.
 *

        }
        return;
    }
}

/**
 * timedomain requantization of the timedomain samples
 *
 * @param q                 pointer to the COOKContext
 * @param buffer            pointer to the timedomain buffer
 * @param gain_now          current gain structure
 * @param gain_previous     previous gain structure
 */

static void gain_window(COOKContext *q, float* buffer, COOKgain* gain_now,
                        COOKgain* gain_previous){
    int i, index;
    int gain_index[9];
    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];
        }
    }
    /* This is applied to the to be previous data buffer. */
    for(i=0;i<8;i++){
        interpolate(q, &buffer[q->samples_per_channel+q->gain_size_factor*i],
                    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];
        }
    }

    /* This is applied to the to be current block. */
    for(i=0;i<8;i++){
        interpolate(q, &buffer[i*q->gain_size_factor],
                    tmp_gain_index+gain_index[i],
                    tmp_gain_index+gain_index[i+1]);
    }
}


/**
 * mlt overlapping and buffer management
 *
 * @param q                 pointer to the COOKContext
 * @param buffer            pointer to the timedomain buffer
 * @param gain_now          current gain structure
 * @param gain_previous     previous gain structure
 * @param previous_buffer   pointer to the previous buffer to be used for overlapping
 *
 */

static void gain_compensate(COOKContext *q, float* buffer, COOKgain* gain_now,
                            COOKgain* gain_previous, float* previous_buffer) {
    int i;
    if((gain_now->size  || gain_previous->size)) {
        gain_window(q, buffer, gain_now, gain_previous);
    }

    /* Overlap with the previous block. */
    for(i=0 ; i<q->samples_per_channel ; i++) buffer[i]+=previous_buffer[i];

    /* Save away the current to be previous block. */
    memcpy(previous_buffer, buffer+q->samples_per_channel,
           sizeof(float)*q->samples_per_channel);
}

 * @param gain_ptr          array of current/prev gain pointers
 */

static inline void
decode_bytes_and_gain(COOKContext *q, uint8_t *inbuffer,
                      COOKgain *gain_ptr[])
{
    int offset;

    offset = decode_bytes(inbuffer, q->decoded_bytes_buffer,
                          q->bits_per_subpacket/8);
    init_get_bits(&q->gb, q->decoded_bytes_buffer + offset,
                  q->bits_per_subpacket);
    decode_gain_info(&q->gb, gain_ptr[0]);

    /* Swap current and previous gains */
    FFSWAP(COOKgain *, gain_ptr[0], gain_ptr[1]);
}

/**
 * Final part of subpacket decoding:
 *  Apply modulated lapped transform, gain compensation,

 * @param chan              0: left or single channel, 1: right channel
 */

static inline void
mlt_compensate_output(COOKContext *q, float *decode_buffer,
                      COOKgain *gain_ptr[], float *previous_buffer,
                      int16_t *out, int chan)
{
    int j;

    cook_imlt(q, decode_buffer, q->mono_mdct_output, q->mlt_tmp);
    gain_compensate(q, q->mono_mdct_output, gain_ptr[0],
                    gain_ptr[1], previous_buffer);

    /* Clip and convert floats to 16 bits.
     */
    for (j = 0; j < q->samples_per_channel; j++) {
        out[chan + q->nb_channels * j] =

//    for (i=0 ; i<sub_packet_size ; i++) {
//        av_log(NULL, AV_LOG_ERROR, "%02x", inbuffer[i]);
//    }
//    av_log(NULL, AV_LOG_ERROR, "\n");

    decode_bytes_and_gain(q, inbuffer, q->gain_ptr1);

    if (q->joint_stereo) {
        joint_decode(q, q->decode_buffer_1, q->decode_buffer_2);
    } else {
        mono_decode(q, q->decode_buffer_1);

        if (q->nb_channels == 2) {
            decode_bytes_and_gain(q, inbuffer + sub_packet_size/2,
                                  q->gain_ptr2);
            mono_decode(q, q->decode_buffer_2);
        }
    }

    mlt_compensate_output(q, q->decode_buffer_1, q->gain_ptr1,
                          q->mono_previous_buffer1, outbuffer, 0);

    if (q->nb_channels == 2) {
        if (q->joint_stereo) {
            mlt_compensate_output(q, q->decode_buffer_2, q->gain_ptr1,
                                  q->mono_previous_buffer2, outbuffer, 1);
        } else {
            mlt_compensate_output(q, q->decode_buffer_2, q->gain_ptr2,
                                  q->mono_previous_buffer2, outbuffer, 1);
        }
    }
    return q->samples_per_frame * sizeof(int16_t);
}

                     + FF_INPUT_BUFFER_PADDING_SIZE);
    }
    if (q->decoded_bytes_buffer == NULL)
        return -1;

    q->gain_ptr1[0] = &q->gain_1;
    q->gain_ptr1[1] = &q->gain_2;
    q->gain_ptr2[0] = &q->gain_3;
    q->gain_ptr2[1] = &q->gain_4;

    /* Initialize transform. */
    if ( init_cook_mlt(q) == 0 )
        return -1;

4639:33fc84eae7c3

#define SUBBAND_SIZE    20
//#define COOKDEBUG

typedef struct {
    int *now;
    int *previous;
} cook_gains;

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

    int                 fft_size;
    int                 fft_order;
    int                 mlt_size;       //modulated lapped transform size

    /* gain buffers */
    cook_gains          gains1;
    cook_gains          gains2;
    int                 gain_1[9];
    int                 gain_2[9];
    int                 gain_3[9];
    int                 gain_4[9];

    /* VLC data */
    int                 js_vlc_bits;
    VLC                 envelope_quant_index[13];
    VLC                 sqvh[7];          //scalar quantization

    return 0;
}

/**
 * Fill the gain array for the timedomain quantization.
 *
 * @param q                 pointer to the COOKContext
 * @param gaininfo[9]       array of gain indices
 */

static void decode_gain_info(GetBitContext *gb, int *gaininfo)
{
    int i, n;

    while (get_bits1(gb)) {}
    n = get_bits_count(gb) - 1;     //amount of elements*2 to update

    i = 0;
    while (n--) {
        int index = get_bits(gb, 3);
        int gain = get_bits1(gb) ? get_bits(gb, 4) - 7 : -1;

        while (i <= index) gaininfo[i++] = gain;
    }
    while (i <= 8) gaininfo[i++] = 0;
}

/**
 * Create the quant index table needed for the envelope.
 *

        }
        return;
    }
}


/**
 * mlt overlapping and buffer management
 *
 * @param q                 pointer to the COOKContext
 * @param gains_ptr         current and previous gains
 * @param previous_buffer   pointer to the previous buffer to be used for overlapping
 */

static void gain_compensate(COOKContext *q, cook_gains *gains_ptr,
                            float* previous_buffer)
{
    const float fc = q->pow2tab[gains_ptr->previous[0] + 63];
    float *buffer = q->mono_mdct_output;
    int i;

    /* Overlap with the previous block. */
    for(i=0 ; i<q->samples_per_channel ; i++) {
        buffer[i] *= fc;
        buffer[i] += previous_buffer[i];
    }

    /* Apply gain profile */
    for (i = 0; i < 8; i++) {
        if (gains_ptr->now[i] || gains_ptr->now[i + 1])
            interpolate(q, &buffer[q->gain_size_factor * i],
                        gains_ptr->now[i], gains_ptr->now[i + 1]);
    }

    /* Save away the current to be previous block. */
    memcpy(previous_buffer, buffer+q->samples_per_channel,
           sizeof(float)*q->samples_per_channel);
}

 * @param gain_ptr          array of current/prev gain pointers
 */

static inline void
decode_bytes_and_gain(COOKContext *q, uint8_t *inbuffer,
                      cook_gains *gains_ptr)
{
    int offset;

    offset = decode_bytes(inbuffer, q->decoded_bytes_buffer,
                          q->bits_per_subpacket/8);
    init_get_bits(&q->gb, q->decoded_bytes_buffer + offset,
                  q->bits_per_subpacket);
    decode_gain_info(&q->gb, gains_ptr->now);

    /* Swap current and previous gains */
    FFSWAP(int *, gains_ptr->now, gains_ptr->previous);
}

/**
 * Final part of subpacket decoding:
 *  Apply modulated lapped transform, gain compensation,

 * @param chan              0: left or single channel, 1: right channel
 */

static inline void
mlt_compensate_output(COOKContext *q, float *decode_buffer,
                      cook_gains *gains, float *previous_buffer,
                      int16_t *out, int chan)
{
    int j;

    cook_imlt(q, decode_buffer, q->mono_mdct_output, q->mlt_tmp);
    gain_compensate(q, gains, previous_buffer);

    /* Clip and convert floats to 16 bits.
     */
    for (j = 0; j < q->samples_per_channel; j++) {
        out[chan + q->nb_channels * j] =

//    for (i=0 ; i<sub_packet_size ; i++) {
//        av_log(NULL, AV_LOG_ERROR, "%02x", inbuffer[i]);
//    }
//    av_log(NULL, AV_LOG_ERROR, "\n");

    decode_bytes_and_gain(q, inbuffer, &q->gains1);

    if (q->joint_stereo) {
        joint_decode(q, q->decode_buffer_1, q->decode_buffer_2);
    } else {
        mono_decode(q, q->decode_buffer_1);

        if (q->nb_channels == 2) {
            decode_bytes_and_gain(q, inbuffer + sub_packet_size/2, &q->gains2);
            mono_decode(q, q->decode_buffer_2);
        }
    }

    mlt_compensate_output(q, q->decode_buffer_1, &q->gains1,
                          q->mono_previous_buffer1, outbuffer, 0);

    if (q->nb_channels == 2) {
        if (q->joint_stereo) {
            mlt_compensate_output(q, q->decode_buffer_2, &q->gains1,
                                  q->mono_previous_buffer2, outbuffer, 1);
        } else {
            mlt_compensate_output(q, q->decode_buffer_2, &q->gains2,
                                  q->mono_previous_buffer2, outbuffer, 1);
        }
    }
    return q->samples_per_frame * sizeof(int16_t);
}

                     + FF_INPUT_BUFFER_PADDING_SIZE);
    }
    if (q->decoded_bytes_buffer == NULL)
        return -1;

    q->gains1.now      = q->gain_1;
    q->gains1.previous = q->gain_2;
    q->gains2.now      = q->gain_3;
    q->gains2.previous = q->gain_4;

    /* Initialize transform. */
    if ( init_cook_mlt(q) == 0 )
        return -1;