comparison wma.c @ 9869:1f6b569bf958 libavcodec

Add support for escape coded wmapro run level coefficients

9868:5cc32c474caf

    return 0;
}

/**
 * Decode run level compressed coefficients.
 * @param avctx codec context
 * @param gb bitstream reader context
 * @param vlc vlc table for get_vlc2
 * @param level_table level codes

                            int num_coefs, int block_len, int frame_len_bits,
                            int coef_nb_bits)
{
    int code, run, level, sign;
    WMACoef* eptr = ptr + num_coefs;
    for(;;) {
        code = get_vlc2(gb, vlc->table, VLCBITS, VLCMAX);
        if (code < 0)
            return -1;
        if (code == 1) {
            /* EOB */
            break;
        } else if (code == 0) {
            /* escape */
            level = get_bits(gb, coef_nb_bits);
            /* NOTE: this is rather suboptimal. reading
               block_len_bits would be better */
            run = get_bits(gb, frame_len_bits);
        } else {
            /* normal code */
            run = run_table[code];
            level = level_table[code];
        }

9869:1f6b569bf958

    return 0;
}

/**
 * Decode an uncompressed coefficient.
 * @param s codec context
 * @return the decoded coefficient
 */
unsigned int ff_wma_get_large_val(GetBitContext* gb)
{
    /** consumes up to 34 bits */
    int n_bits = 8;
    /** decode length */
    if (get_bits1(gb)) {
        n_bits += 8;
        if (get_bits1(gb)) {
            n_bits += 8;
            if (get_bits1(gb)) {
                n_bits += 7;
            }
        }
    }
    return get_bits_long(gb, n_bits);
}

/**
 * Decode run level compressed coefficients.
 * @param avctx codec context
 * @param gb bitstream reader context
 * @param vlc vlc table for get_vlc2
 * @param level_table level codes

                            int num_coefs, int block_len, int frame_len_bits,
                            int coef_nb_bits)
{
    int code, run, level, sign;
    WMACoef* eptr = ptr + num_coefs;
    ptr += offset;
    for(;;) {
        code = get_vlc2(gb, vlc->table, VLCBITS, VLCMAX);
        if (code < 0)
            return -1;
        if (code == 1) {
            /* EOB */
            break;
        } else if (code == 0) {
            /* escape */
            if (!version) {
            level = get_bits(gb, coef_nb_bits);
            /* NOTE: this is rather suboptimal. reading
               block_len_bits would be better */
            run = get_bits(gb, frame_len_bits);
            } else {
                level = ff_wma_get_large_val(gb);
                /** escape decode */
                if (get_bits1(gb)) {
                    if (get_bits1(gb)) {
                        if (get_bits1(gb)) {
                            av_log(avctx,AV_LOG_ERROR,
                                "broken escape sequence\n");
                            return -1;
                        } else
                            run = get_bits(gb, frame_len_bits) + 4;
                    } else
                        run = get_bits(gb, 2) + 1;
                } else
                     run = 0;
            }
        } else {
            /* normal code */
            run = run_table[code];
            level = level_table[code];
        }