comparison wavpack.c @ 9589:3f7496cd7cab libavcodec

Decode extended bitstream for high-precision WavPack files. Patch by Laurent Aimar [(wolf, son of Loki) <at> (videolan) <dot> (org)]

9588:b0e7d5ced43b

    WP_ID_SHAPING,
    WP_ID_FLOATINFO,
    WP_ID_INT32INFO,
    WP_ID_DATA,
    WP_ID_CORR,
    WP_ID_FLT,
    WP_ID_CHANINFO
};

#define MAX_TERMS 16

    int frame_flags;
    int stereo, stereo_in;
    int joint;
    uint32_t CRC;
    GetBitContext gb;
    int data_size; // in bits
    int samples;
    int terms;
    Decorr decorr[MAX_TERMS];
    int zero, one, zeroes;
    int and, or, shift;
    int post_shift;
    int hybrid, hybrid_bitrate;
    WvChannel ch[2];
} WavpackContext;

    int i, j, count = 0;
    int last, t;
    int A, B, L, L2, R, R2, bit;
    int pos = 0;
    uint32_t crc = 0xFFFFFFFF;
    int16_t *dst16 = dst;
    int32_t *dst32 = dst;

    s->one = s->zero = s->zeroes = 0;
    do{

        }
        pos = (pos + 1) & 7;
        if(s->joint)
            L += (R -= (L >> 1));
        crc = (crc * 3 + L) * 3 + R;
        bit = (L & s->and) | s->or;
        if(hires)
            *dst32++ = (((L + bit) << s->shift) - bit) << s->post_shift;
        else
            *dst16++ = (((L + bit) << s->shift) - bit) << s->post_shift;

    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    return count * 2;
}

static inline int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
{
    int i, j, count = 0;
    int last, t;
    int A, S, T, bit;
    int pos = 0;
    uint32_t crc = 0xFFFFFFFF;
    int16_t *dst16 = dst;
    int32_t *dst32 = dst;

    s->one = s->zero = s->zeroes = 0;
    do{

            if(A && T) s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
            s->decorr[i].samplesA[j] = T = S;
        }
        pos = (pos + 1) & 7;
        crc = crc * 3 + S;
        bit = (S & s->and) | s->or;
        if(hires)
            *dst32++ = (((S + bit) << s->shift) - bit) << s->post_shift;
        else
            *dst16++ = (((S + bit) << s->shift) - bit) << s->post_shift;
        count++;
    }while(!last && count < s->samples);

    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    return count;
}

        return 0;
    }

    memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
    memset(s->ch, 0, sizeof(s->ch));
    s->and = s->or = s->shift = 0;

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples){
        *data_size = 0;
        return buf_size;

                av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
                buf += ssize;
                continue;
            }
            if(buf[0])
                s->post_shift = buf[0];
            else if(buf[1])
                s->shift = buf[1];
            else if(buf[2]){
                s->and = s->or = 1;
                s->shift = buf[2];

        case WP_ID_DATA:
            init_get_bits(&s->gb, buf, size * 8);
            s->data_size = size * 8;
            buf += size;
            got_bs = 1;
            break;
        default:
            buf += size;
        }
        if(id & WP_IDF_ODD) buf++;

9589:3f7496cd7cab

    WP_ID_SHAPING,
    WP_ID_FLOATINFO,
    WP_ID_INT32INFO,
    WP_ID_DATA,
    WP_ID_CORR,
    WP_ID_EXTRABITS,
    WP_ID_CHANINFO
};

#define MAX_TERMS 16

    int frame_flags;
    int stereo, stereo_in;
    int joint;
    uint32_t CRC;
    GetBitContext gb;
    int got_extra_bits;
    uint32_t crc_extra_bits;
    GetBitContext gb_extra_bits;
    int data_size; // in bits
    int samples;
    int terms;
    Decorr decorr[MAX_TERMS];
    int zero, one, zeroes;
    int extra_bits;
    int and, or, shift;
    int post_shift;
    int hybrid, hybrid_bitrate;
    WvChannel ch[2];
} WavpackContext;

    int i, j, count = 0;
    int last, t;
    int A, B, L, L2, R, R2, bit;
    int pos = 0;
    uint32_t crc = 0xFFFFFFFF;
    uint32_t crc_extra_bits = 0xFFFFFFFF;
    int16_t *dst16 = dst;
    int32_t *dst32 = dst;

    s->one = s->zero = s->zeroes = 0;
    do{

        }
        pos = (pos + 1) & 7;
        if(s->joint)
            L += (R -= (L >> 1));
        crc = (crc * 3 + L) * 3 + R;
        if(s->extra_bits){
            L <<= s->extra_bits;
            R <<= s->extra_bits;

            if(s->got_extra_bits){
                L |= get_bits(&s->gb_extra_bits, s->extra_bits);
                crc_extra_bits = crc_extra_bits * 9 + (L&0xffff) * 3 + ((unsigned)L>>16);

                R |= get_bits(&s->gb_extra_bits, s->extra_bits);
                crc_extra_bits = crc_extra_bits * 9 + (R&0xffff) * 3 + ((unsigned)R>>16);
            }
        }
        bit = (L & s->and) | s->or;
        if(hires)
            *dst32++ = (((L + bit) << s->shift) - bit) << s->post_shift;
        else
            *dst16++ = (((L + bit) << s->shift) - bit) << s->post_shift;

    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
        av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
        return -1;
    }
    return count * 2;
}

static inline int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
{
    int i, j, count = 0;
    int last, t;
    int A, S, T, bit;
    int pos = 0;
    uint32_t crc = 0xFFFFFFFF;
    uint32_t crc_extra_bits = 0xFFFFFFFF;
    int16_t *dst16 = dst;
    int32_t *dst32 = dst;

    s->one = s->zero = s->zeroes = 0;
    do{

            if(A && T) s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
            s->decorr[i].samplesA[j] = T = S;
        }
        pos = (pos + 1) & 7;
        crc = crc * 3 + S;
        if(s->extra_bits){
            S <<= s->extra_bits;

            if(s->got_extra_bits){
                S |= get_bits(&s->gb_extra_bits, s->extra_bits);
                crc_extra_bits = crc_extra_bits * 9 + (S&0xffff) * 3 + ((unsigned)S>>16);
            }
        }

        bit = (S & s->and) | s->or;
        if(hires)
            *dst32++ = (((S + bit) << s->shift) - bit) << s->post_shift;
        else
            *dst16++ = (((S + bit) << s->shift) - bit) << s->post_shift;
        count++;
    }while(!last && count < s->samples);

    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
        av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
        return -1;
    }
    return count;
}

        return 0;
    }

    memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
    memset(s->ch, 0, sizeof(s->ch));
    s->extra_bits = 0;
    s->and = s->or = s->shift = 0;
    s->got_extra_bits = 0;

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples){
        *data_size = 0;
        return buf_size;

                av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
                buf += ssize;
                continue;
            }
            if(buf[0])
                s->extra_bits = buf[0];
            else if(buf[1])
                s->shift = buf[1];
            else if(buf[2]){
                s->and = s->or = 1;
                s->shift = buf[2];

        case WP_ID_DATA:
            init_get_bits(&s->gb, buf, size * 8);
            s->data_size = size * 8;
            buf += size;
            got_bs = 1;
            break;
        case WP_ID_EXTRABITS:
            if(size <= 4){
                av_log(avctx, AV_LOG_ERROR, "Invalid EXTRABITS, size = %i\n", size);
                buf += size;
                continue;
            }
            init_get_bits(&s->gb_extra_bits, buf, size * 8);
            s->crc_extra_bits = get_bits_long(&s->gb_extra_bits, 32);
            buf += size;
            s->got_extra_bits = 1;
            break;
        default:
            buf += size;
        }
        if(id & WP_IDF_ODD) buf++;