comparison h263.c @ 281:1fc96b02142e libavcodec

mpeg4 aspect_ratio_info in AVCodecContext (requested by alex) experimental (& faster) motion estimation squished a dirty uninitialized var bug mpeg1 fcode>1 support

280:3dc1ca4ba717

    put_bits(&s->pb, 1, 0);		/* random access vol */
    put_bits(&s->pb, 8, 1);		/* video obj type indication= simple obj */
    put_bits(&s->pb, 1, 1);		/* is obj layer id= yes */
      put_bits(&s->pb, 4, vo_ver_id);	/* is obj layer ver id */
      put_bits(&s->pb, 3, 1);		/* is obj layer priority */
    put_bits(&s->pb, 4, 1);		/* aspect ratio info= sqare pixel */ //FIXME real aspect
    put_bits(&s->pb, 1, 0);		/* vol control parameters= no */
    put_bits(&s->pb, 2, RECT_SHAPE);	/* vol shape= rectangle */
    put_bits(&s->pb, 1, 1);		/* marker bit */
    put_bits(&s->pb, 16, s->time_increment_resolution=30000);
    s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;

        s->aspect_ratio_info= get_bits(&s->gb, 4);
	if(s->aspect_ratio_info == EXTENDET_PAR){
            skip_bits(&s->gb, 8); //par_width
            skip_bits(&s->gb, 8); // par_height
        }
        if(get_bits1(&s->gb)){ /* vol control parameter */
            printf("vol control parameter not supported\n");
            return -1;   
        }
        s->shape = get_bits(&s->gb, 2); /* vol shape */

         if (s->pict_type == B_TYPE) {
             s->b_code = get_bits(&s->gb, 3);
//printf("b-code %d\n", s->b_code);
         }
//printf("quant:%d fcode:%d\n", s->qscale, s->f_code);

         if(!s->scalability){
             if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) {
                 skip_bits1(&s->gb); // vop shape coding type
             }
         }

281:1fc96b02142e

    put_bits(&s->pb, 1, 0);		/* random access vol */
    put_bits(&s->pb, 8, 1);		/* video obj type indication= simple obj */
    put_bits(&s->pb, 1, 1);		/* is obj layer id= yes */
      put_bits(&s->pb, 4, vo_ver_id);	/* is obj layer ver id */
      put_bits(&s->pb, 3, 1);		/* is obj layer priority */
    if(s->aspect_ratio_info) 
        put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
    else
        put_bits(&s->pb, 4, 1);		/* aspect ratio info= sqare pixel */
    put_bits(&s->pb, 1, 0);		/* vol control parameters= no */
    put_bits(&s->pb, 2, RECT_SHAPE);	/* vol shape= rectangle */
    put_bits(&s->pb, 1, 1);		/* marker bit */
    put_bits(&s->pb, 16, s->time_increment_resolution=30000);
    s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;

        s->aspect_ratio_info= get_bits(&s->gb, 4);
	if(s->aspect_ratio_info == EXTENDET_PAR){
            skip_bits(&s->gb, 8); //par_width
            skip_bits(&s->gb, 8); // par_height
        }

        if(get_bits1(&s->gb)){ /* vol control parameter */
            printf("vol control parameter not supported\n");
            return -1;   
        }
        s->shape = get_bits(&s->gb, 2); /* vol shape */

         if (s->pict_type == B_TYPE) {
             s->b_code = get_bits(&s->gb, 3);
//printf("b-code %d\n", s->b_code);
         }
//printf("quant:%d fcode:%d\n", s->qscale, s->f_code);
         if(!s->scalability){
             if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) {
                 skip_bits1(&s->gb); // vop shape coding type
             }
         }