comparison alac.c @ 6632:4aa644a88500 libavcodec

Remove wrapper around av_log2()

6631:76a252cc9ba3

    allocate_buffers(alac);

    return 0;
}

static inline int count_leading_zeros(int32_t input)
{
    return 31-av_log2(input);
}


static inline int decode_scalar(GetBitContext *gb, int k, int limit, int readsamplesize){
    /* read x - number of 1s before 0 represent the rice */
    int x = get_unary_0_9(gb);

    if (x > 8) { /* RICE THRESHOLD */

        /* standard rice encoding */
        int k; /* size of extra bits */

        /* read k, that is bits as is */
        k = 31 - count_leading_zeros((history >> 9) + 3);
        x= decode_scalar(&alac->gb, k, rice_kmodifier, readsamplesize);

        x_modified = sign_modifier + x;
        final_val = (x_modified + 1) / 2;
        if (x_modified & 1) final_val *= -1;

        if ((history < 128) && (output_count+1 < output_size)) {
            int block_size, k;

            sign_modifier = 1;

            k = count_leading_zeros(history) + ((history + 16) >> 6 /* / 64 */) - 24;

            block_size= decode_scalar(&alac->gb, k, rice_kmodifier, 16);

            if (block_size > 0) {
                memset(&output_buffer[output_count+1], 0, block_size * 4);

6632:4aa644a88500

    allocate_buffers(alac);

    return 0;
}

static inline int decode_scalar(GetBitContext *gb, int k, int limit, int readsamplesize){
    /* read x - number of 1s before 0 represent the rice */
    int x = get_unary_0_9(gb);

    if (x > 8) { /* RICE THRESHOLD */

        /* standard rice encoding */
        int k; /* size of extra bits */

        /* read k, that is bits as is */
        k = av_log2((history >> 9) + 3);
        x= decode_scalar(&alac->gb, k, rice_kmodifier, readsamplesize);

        x_modified = sign_modifier + x;
        final_val = (x_modified + 1) / 2;
        if (x_modified & 1) final_val *= -1;

        if ((history < 128) && (output_count+1 < output_size)) {
            int block_size, k;

            sign_modifier = 1;

            k = 7 - av_log2(history) + ((history + 16) >> 6 /* / 64 */);

            block_size= decode_scalar(&alac->gb, k, rice_kmodifier, 16);

            if (block_size > 0) {
                memset(&output_buffer[output_count+1], 0, block_size * 4);