comparison cook.c @ 3009:f5898b9b8a8a libavcodec

Fix an out of array access and some minor cleanup of the code. All available cook samples decode correctly now. patch by Benjamin Larsson < banan ** at ** student ** dot ** ltu ** dot ** se >

3008:e23d2bddf122

    float               gain_table[23];
    float               pow2tab[127];
    float               rootpow2tab[127];

    /* data buffers */
    uint8_t*            frame_reorder_buffer;
    int*                frame_reorder_index;
    int                 frame_reorder_counter;
    int                 frame_reorder_complete;
    int                 frame_reorder_index_size;

    uint8_t*            decoded_bytes_buffer;
    float               mono_mdct_output[2048] __attribute__((aligned(16)));
    float*              previous_buffer_ptr[2];
    float               mono_previous_buffer1[1024];

    /* Free allocated memory buffers. */
    av_free(q->mlt_window);
    av_free(q->mlt_precos);
    av_free(q->mlt_presin);
    av_free(q->mlt_postcos);
    av_free(q->frame_reorder_index);
    av_free(q->frame_reorder_buffer);
    av_free(q->decoded_bytes_buffer);

    /* Free the transform. */
    ff_fft_end(&q->fft_ctx);

static void joint_decode(COOKContext *q, float* mlt_buffer1,
                         float* mlt_buffer2) {
    int i,j;
    int decouple_tab[SUBBAND_SIZE];
    float decode_buffer[2048];  //Only 1060 might be needed.
    int idx, cpl_tmp,tmp_idx;
    float f1,f2;
    float* cplscale;

    memset(decouple_tab, 0, sizeof(decouple_tab));

    }

    /* When we reach js_subband_start (the higher frequencies)
       the coefficients are stored in a coupling scheme. */
    idx = (1 << q->js_vlc_bits) - 1;
    if (q->js_subband_start < q->subbands) {
        for (i=0 ; i<q->subbands ; i++) {
            cpl_tmp = cplband[i + q->js_subband_start];
            idx -=decouple_tab[cpl_tmp];
            cplscale = (float*)cplscales[q->js_vlc_bits-2];  //choose decoupler table
            f1 = cplscale[decouple_tab[cpl_tmp]];
            f2 = cplscale[idx-1];
            for (j=0 ; j<SUBBAND_SIZE ; j++) {
                tmp_idx = ((2*q->js_subband_start + i)*20)+j;
                mlt_buffer1[20*(i+q->js_subband_start) + j] = f1 * decode_buffer[tmp_idx];
                mlt_buffer2[20*(i+q->js_subband_start) + j] = f2 * decode_buffer[tmp_idx];
            }
            idx = (1 << q->js_vlc_bits) - 1;
        }
    }
}

/**
 * Cook subpacket decoding. This function returns one decoded subpacket,

    PRINT("mlt_size",q->mlt_size);
    PRINT("js_subband_start",q->js_subband_start);
    PRINT("numvector_bits",q->numvector_bits);
    PRINT("numvector_size",q->numvector_size);
    PRINT("total_subbands",q->total_subbands);
    PRINT("frame_reorder_counter",q->frame_reorder_counter);
    PRINT("frame_reorder_index_size",q->frame_reorder_index_size);
}
#endif
/**
 * Cook initialization
 *

    memset(q->decode_buffer_4,0,1024*sizeof(float));

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

    //dump_cook_context(q,e);
    return 0;
}


AVCodec cook_decoder =

3009:f5898b9b8a8a

    float               gain_table[23];
    float               pow2tab[127];
    float               rootpow2tab[127];

    /* data buffers */

    uint8_t*            decoded_bytes_buffer;
    float               mono_mdct_output[2048] __attribute__((aligned(16)));
    float*              previous_buffer_ptr[2];
    float               mono_previous_buffer1[1024];

    /* Free allocated memory buffers. */
    av_free(q->mlt_window);
    av_free(q->mlt_precos);
    av_free(q->mlt_presin);
    av_free(q->mlt_postcos);
    av_free(q->decoded_bytes_buffer);

    /* Free the transform. */
    ff_fft_end(&q->fft_ctx);

static void joint_decode(COOKContext *q, float* mlt_buffer1,
                         float* mlt_buffer2) {
    int i,j;
    int decouple_tab[SUBBAND_SIZE];
    float decode_buffer[1060];
    int idx, cpl_tmp,tmp_idx;
    float f1,f2;
    float* cplscale;

    memset(decouple_tab, 0, sizeof(decouple_tab));

    }

    /* When we reach js_subband_start (the higher frequencies)
       the coefficients are stored in a coupling scheme. */
    idx = (1 << q->js_vlc_bits) - 1;
    for (i=q->js_subband_start ; i<q->subbands ; i++) {
        cpl_tmp = cplband[i];
        idx -=decouple_tab[cpl_tmp];
        cplscale = (float*)cplscales[q->js_vlc_bits-2];  //choose decoupler table
        f1 = cplscale[decouple_tab[cpl_tmp]];
        f2 = cplscale[idx-1];
        for (j=0 ; j<SUBBAND_SIZE ; j++) {
            tmp_idx = ((q->js_subband_start + i)*20)+j;
            mlt_buffer1[20*i + j] = f1 * decode_buffer[tmp_idx];
            mlt_buffer2[20*i + j] = f2 * decode_buffer[tmp_idx];
        }
        idx = (1 << q->js_vlc_bits) - 1;
    }
}

/**
 * Cook subpacket decoding. This function returns one decoded subpacket,

    PRINT("mlt_size",q->mlt_size);
    PRINT("js_subband_start",q->js_subband_start);
    PRINT("numvector_bits",q->numvector_bits);
    PRINT("numvector_size",q->numvector_size);
    PRINT("total_subbands",q->total_subbands);
}
#endif
/**
 * Cook initialization
 *

    memset(q->decode_buffer_4,0,1024*sizeof(float));

    /* Initialize transform. */
    if ( init_cook_mlt(q) == 0 )
        return -1;
#ifdef COOKDEBUG
    dump_cook_context(q,e);
#endif
    return 0;
}


AVCodec cook_decoder =