comparison h263.c @ 1393:ba99a78bcb37 libavcodec

make the h263 decoder more error tolerant

1392:13a02518ffb6

    s->qscale = get_bits(&s->gb, 5); /* GQUANT */
    if(s->qscale==0) 
        return -1;
    s->mb_x= 0;
    s->mb_y= s->gob_index* s->gob_number;
#ifdef DEBUG
    fprintf(stderr, "\nGN: %u GFID: %u Quant: %u\n", s->gob_number, gfid, s->qscale);
#endif
    return 0;
}

    
    align_get_bits(&s->gb);

    startcode= get_bits(&s->gb, 22-8);

    for(i= s->gb.size_in_bits - get_bits_count(&s->gb); i>0; i--) {
        startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF;
        
        if(startcode == 0x20)
            break;
    }

        width = h263_format[format][0];
        height = h263_format[format][1];
        if (!width)
            return -1;
        
        s->width = width;
        s->height = height;
        s->pict_type = I_TYPE + get_bits1(&s->gb);

        s->unrestricted_mv = get_bits1(&s->gb); 
        s->h263_long_vectors = s->unrestricted_mv;

            fprintf(stderr, "H263 PB frame not supported\n");
            return -1;	/* not PB frame */
        }
        s->qscale = get_bits(&s->gb, 5);
        skip_bits1(&s->gb);	/* Continuous Presence Multipoint mode: off */
    } else {
        int ufep;
        
        /* H.263v2 */
        s->h263_plus = 1;

1393:ba99a78bcb37

    s->qscale = get_bits(&s->gb, 5); /* GQUANT */
    if(s->qscale==0) 
        return -1;
    s->mb_x= 0;
    s->mb_y= s->gob_index* s->gob_number;
    if(s->mb_y >= s->mb_height) 
        return -1;
#ifdef DEBUG
    fprintf(stderr, "\nGN: %u GFID: %u Quant: %u\n", s->gob_number, gfid, s->qscale);
#endif
    return 0;
}

    
    align_get_bits(&s->gb);

    startcode= get_bits(&s->gb, 22-8);

    for(i= s->gb.size_in_bits - get_bits_count(&s->gb); i>24; i-=8) {
        startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF;
        
        if(startcode == 0x20)
            break;
    }

        width = h263_format[format][0];
        height = h263_format[format][1];
        if (!width)
            return -1;
        
        s->pict_type = I_TYPE + get_bits1(&s->gb);

        s->unrestricted_mv = get_bits1(&s->gb); 
        s->h263_long_vectors = s->unrestricted_mv;

            fprintf(stderr, "H263 PB frame not supported\n");
            return -1;	/* not PB frame */
        }
        s->qscale = get_bits(&s->gb, 5);
        skip_bits1(&s->gb);	/* Continuous Presence Multipoint mode: off */

        s->width = width;
        s->height = height;
    } else {
        int ufep;
        
        /* H.263v2 */
        s->h263_plus = 1;