comparison h263.c @ 661:a0901e38c564 libavcodec

fixing interlaced mpeg4 decoding

660:b8e268337a1d

                    my = h263_decode_motion(s, pred_y/2, s->f_code);
                    if (my >= 0xffff)
                        return -1;

                    s->mv[0][i][0] = mx;
                    s->mv[0][i][1] = my*2;
                }
            }else{
                PRINT_MB_TYPE("P");
                /* 16x16 motion prediction */
                s->mv_type = MV_TYPE_16X16;

        i = 0;
        if (!coded) 
            goto not_coded;
        rl = &rl_intra;
        rl_vlc = rl_intra.rl_vlc[0];
        if (s->ac_pred) {
            if (dc_pred_dir == 0) 
                scan_table = ff_alternate_vertical_scan; /* left */
            else
                scan_table = ff_alternate_horizontal_scan; /* top */
        } else {

        if (!coded) {
            s->block_last_index[n] = i;
            return 0;
        }
        rl = &rl_inter;
        scan_table = zigzag_direct;
        if(s->mpeg_quant){
            qmul=1;
            qadd=0;
            rl_vlc = rl_inter.rl_vlc[0];        
        }else{

         t=get_bits(&s->gb, 3); /* intra dc VLC threshold */
//printf("threshold %d\n", t);
         if(!s->progressive_sequence){
             s->top_field_first= get_bits1(&s->gb);
             s->alternate_scan= get_bits1(&s->gb);
//printf("top:%d alt:%d\n", s->top_field_first, s->alternate_scan);
         }
     }

     if(s->pict_type == S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){
         if(s->num_sprite_warping_points){
             mpeg4_decode_sprite_trajectory(s);

         if (s->pict_type == B_TYPE) {
             s->b_code = get_bits(&s->gb, 3);
         }else
             s->b_code=1;

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

661:a0901e38c564

                    my = h263_decode_motion(s, pred_y/2, s->f_code);
                    if (my >= 0xffff)
                        return -1;

                    s->mv[0][i][0] = mx;
                    s->mv[0][i][1] = my;
                }
            }else{
                PRINT_MB_TYPE("P");
                /* 16x16 motion prediction */
                s->mv_type = MV_TYPE_16X16;

        i = 0;
        if (!coded) 
            goto not_coded;
        rl = &rl_intra;
        rl_vlc = rl_intra.rl_vlc[0];
        if(s->alternate_scan)
            scan_table = ff_alternate_vertical_scan; /* left */
        else if (s->ac_pred) {
            if (dc_pred_dir == 0) 
                scan_table = ff_alternate_vertical_scan; /* left */
            else
                scan_table = ff_alternate_horizontal_scan; /* top */
        } else {

        if (!coded) {
            s->block_last_index[n] = i;
            return 0;
        }
        rl = &rl_inter;
   
        if(s->alternate_scan)
            scan_table = ff_alternate_vertical_scan; /* left */
        else
            scan_table = zigzag_direct;

        if(s->mpeg_quant){
            qmul=1;
            qadd=0;
            rl_vlc = rl_inter.rl_vlc[0];        
        }else{

         t=get_bits(&s->gb, 3); /* intra dc VLC threshold */
//printf("threshold %d\n", t);
         if(!s->progressive_sequence){
             s->top_field_first= get_bits1(&s->gb);
             s->alternate_scan= get_bits1(&s->gb);
         }else
             s->alternate_scan= 0;
     }

     if(s->pict_type == S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){
         if(s->num_sprite_warping_points){
             mpeg4_decode_sprite_trajectory(s);

         if (s->pict_type == B_TYPE) {
             s->b_code = get_bits(&s->gb, 3);
         }else
             s->b_code=1;

//printf("qpuant:%d fcode:%d bcode:%d type:%d size:%d pro:%d alt:%d\n", 
//    s->qscale, s->f_code, s->b_code, s->pict_type, s->gb.size,s->progressive_sequence, s->alternate_scan);
         if(!s->scalability){
             if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) {
                 skip_bits1(&s->gb); // vop shape coding type
             }
         }else{