comparison rv10.c @ 622:a1e54c24f221 libavcodec

working around undefined behavior of get-vlc if the vlc s invalid more debug output by default for errors (so we can see immedeatly whats wrong on bugreports) guess long_vectors mode

621:980b661a494a

#include "dsputil.h"
#include "mpegvideo.h"

//#define DEBUG

#define DC_VLC_BITS 9

static const UINT16 rv_lum_code[256] =
{
 0x3e7f, 0x0f00, 0x0f01, 0x0f02, 0x0f03, 0x0f04, 0x0f05, 0x0f06,
 0x0f07, 0x0f08, 0x0f09, 0x0f0a, 0x0f0b, 0x0f0c, 0x0f0d, 0x0f0e,

                code = -128 + get_bits(&s->gb, 7);
            } else if (code == 0x1fe) {
                get_bits(&s->gb, 9);
                code = 1;
            } else {
                return 0xffff;
            }
        } else {
            code -= 128;
        }

/* read RV 1.0 compatible frame header */
static int rv10_decode_picture_header(MpegEncContext *s)
{
    int mb_count, pb_frame, marker, h, full_frame;
    
    /* skip packet header */
    h = get_bits(&s->gb, 8);
    if ((h & 0xc0) == 0xc0) {
        int len, pos;
        full_frame = 1;
        len = get_num(&s->gb);
        pos = get_num(&s->gb);
    } else {
        int seq, frame_size, pos;
        full_frame = 0;
        seq = get_bits(&s->gb, 8);
        frame_size = get_num(&s->gb);
        pos = get_num(&s->gb);
    }
    /* picture number */
    get_bits(&s->gb, 8);

    marker = get_bits(&s->gb, 1);

    if (get_bits(&s->gb, 1))
        s->pict_type = P_TYPE;
    else
        s->pict_type = I_TYPE;

    pb_frame = get_bits(&s->gb, 1);

#ifdef DEBUG
    printf("pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame);
#endif
    
    if (pb_frame)
        return -1;

    s->qscale = get_bits(&s->gb, 5);
    if(s->qscale==0){
        fprintf(stderr, "error, qscale:0\n");
        return -1;

    } else {
        s->mb_x = 0;
        s->mb_y = 0;
        mb_count = s->mb_width * s->mb_height;
    }
//printf("%d\n", get_bits(&s->gb, 3));
    get_bits(&s->gb, 3);	/* ignored */
    s->f_code = 1;
    s->unrestricted_mv = 1;
#if 0
    s->h263_long_vectors = 1;
#endif

    init_get_bits(&s->gb, buf, buf_size);

    mb_count = rv10_decode_picture_header(s);
    if (mb_count < 0) {
#ifdef DEBUG
        printf("HEADER ERROR\n");
#endif
        return -1;
    }
    
    if (s->mb_x >= s->mb_width ||
        s->mb_y >= s->mb_height) {
#ifdef DEBUG
        printf("POS ERROR %d %d\n", s->mb_x, s->mb_y);
#endif
        return -1;
    }
    mb_pos = s->mb_y * s->mb_width + s->mb_x;
    left = s->mb_width * s->mb_height - mb_pos;
    if (mb_count > left) {
#ifdef DEBUG
        printf("COUNT ERROR\n");
#endif
        return -1;
    }

    if (s->mb_x == 0 && s->mb_y == 0) {
        MPV_frame_start(s, avctx);

        
        memset(block, 0, sizeof(block));
        s->mv_dir = MV_DIR_FORWARD;
        s->mv_type = MV_TYPE_16X16; 
        if (h263_decode_mb(s, block) < 0) {
#ifdef DEBUG
            printf("ERROR\n");
#endif
            return -1;
        }
        MPV_decode_mb(s, block);
        if (++s->mb_x == s->mb_width) {
            s->mb_x = 0;

622:a1e54c24f221

#include "dsputil.h"
#include "mpegvideo.h"

//#define DEBUG

#define DC_VLC_BITS 14 //FIXME find a better solution

static const UINT16 rv_lum_code[256] =
{
 0x3e7f, 0x0f00, 0x0f01, 0x0f02, 0x0f03, 0x0f04, 0x0f05, 0x0f06,
 0x0f07, 0x0f08, 0x0f09, 0x0f0a, 0x0f0b, 0x0f0c, 0x0f0d, 0x0f0e,

                code = -128 + get_bits(&s->gb, 7);
            } else if (code == 0x1fe) {
                get_bits(&s->gb, 9);
                code = 1;
            } else {
                fprintf(stderr, "chroma dc error\n");
                return 0xffff;
            }
        } else {
            code -= 128;
        }

/* read RV 1.0 compatible frame header */
static int rv10_decode_picture_header(MpegEncContext *s)
{
    int mb_count, pb_frame, marker, h, full_frame;
    int pic_num, unk;
    
    /* skip packet header */
    h = get_bits(&s->gb, 8);
    if ((h & 0xc0) == 0xc0) {
        int len, pos;
        full_frame = 1;
        len = get_num(&s->gb);
        pos = get_num(&s->gb);
//printf("pos:%d\n",len);
    } else {
        int seq, frame_size, pos;
        full_frame = 0;
        seq = get_bits(&s->gb, 8);
        frame_size = get_num(&s->gb);
        pos = get_num(&s->gb);
//printf("seq:%d, size:%d, pos:%d\n",seq,frame_size,pos);
    }
    /* picture number */
    pic_num= get_bits(&s->gb, 8);

    marker = get_bits(&s->gb, 1);

    if (get_bits(&s->gb, 1))
        s->pict_type = P_TYPE;
    else
        s->pict_type = I_TYPE;
//printf("h:%d ver:%d\n",h,s->rv10_version);
if(!marker) printf("marker missing\n");
    pb_frame = get_bits(&s->gb, 1);

#ifdef DEBUG
    printf("pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame);
#endif
    
    if (pb_frame){
        fprintf(stderr, "pb frame not supported\n");
        return -1;
    }

    s->qscale = get_bits(&s->gb, 5);
    if(s->qscale==0){
        fprintf(stderr, "error, qscale:0\n");
        return -1;

    } else {
        s->mb_x = 0;
        s->mb_y = 0;
        mb_count = s->mb_width * s->mb_height;
    }
    unk= get_bits(&s->gb, 3);	/* ignored */
//printf("%d\n", unk);
s->h263_long_vectors =  s->mb_num<100; //FIXME check if this is ok (100 i just guessed)
    s->f_code = 1;
    s->unrestricted_mv = 1;
#if 0
    s->h263_long_vectors = 1;
#endif

    init_get_bits(&s->gb, buf, buf_size);

    mb_count = rv10_decode_picture_header(s);
    if (mb_count < 0) {
        fprintf(stderr, "HEADER ERROR\n");
        return -1;
    }
    
    if (s->mb_x >= s->mb_width ||
        s->mb_y >= s->mb_height) {
        fprintf(stderr, "POS ERROR %d %d\n", s->mb_x, s->mb_y);
        return -1;
    }
    mb_pos = s->mb_y * s->mb_width + s->mb_x;
    left = s->mb_width * s->mb_height - mb_pos;
    if (mb_count > left) {
        fprintf(stderr, "COUNT ERROR\n");
        return -1;
    }

    if (s->mb_x == 0 && s->mb_y == 0) {
        MPV_frame_start(s, avctx);

        
        memset(block, 0, sizeof(block));
        s->mv_dir = MV_DIR_FORWARD;
        s->mv_type = MV_TYPE_16X16; 
        if (h263_decode_mb(s, block) < 0) {
            fprintf(stderr, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
            return -1;
        }
        MPV_decode_mb(s, block);
        if (++s->mb_x == s->mb_width) {
            s->mb_x = 0;