comparison motion_est.c @ 691:199b324b2693 libavcodec

fixing variance scaling for b frames (messed adaptive quants up) cliping too long MVs in b frames instead of setting them to 0

690:a1c69cb685b3

        }
        if(fbmin<score){
            score=fbmin;
            type= MB_TYPE_BIDIR;
        }
        score= (score*score)>>8;
        s->mc_mb_var_sum += score;
        s->mc_mb_var[mb_y*s->mb_width + mb_x] = score; //FIXME use SSD
    }

    if(s->flags&CODEC_FLAG_HQ){

    for(y=0; y<s->mb_height; y++){
        int x;
        int xy= (y+1)* (s->mb_width+2)+1;
        int i= y*s->mb_width;
        for(x=0; x<s->mb_width; x++){
            if(s->mb_type[i]&type){
                if(   fcode_tab[mv_table[xy][0] + MAX_MV] > f_code
                   || fcode_tab[mv_table[xy][0] + MAX_MV] == 0
                   || fcode_tab[mv_table[xy][1] + MAX_MV] > f_code
                   || fcode_tab[mv_table[xy][1] + MAX_MV] == 0 ){
                    if(s->mb_type[i]&(~type)) s->mb_type[i] &= ~type;
                    else{
                        mv_table[xy][0] = 0;
                        mv_table[xy][1] = 0;
                        //this is certainly bad FIXME            
                    }
                }
            }
            xy++;
            i++;
        }
    }

691:199b324b2693

        }
        if(fbmin<score){
            score=fbmin;
            type= MB_TYPE_BIDIR;
        }
        score= (score*score + 128*256)>>16;
        s->mc_mb_var_sum += score;
        s->mc_mb_var[mb_y*s->mb_width + mb_x] = score; //FIXME use SSD
    }

    if(s->flags&CODEC_FLAG_HQ){

    for(y=0; y<s->mb_height; y++){
        int x;
        int xy= (y+1)* (s->mb_width+2)+1;
        int i= y*s->mb_width;
        for(x=0; x<s->mb_width; x++){
            if(   fcode_tab[mv_table[xy][0] + MAX_MV] > f_code
               || fcode_tab[mv_table[xy][0] + MAX_MV] == 0){
                if(mv_table[xy][0]>0) mv_table[xy][0]=  (16<<f_code)-1;
                else                  mv_table[xy][0]= -(16<<f_code);
            }
            if(   fcode_tab[mv_table[xy][1] + MAX_MV] > f_code
               || fcode_tab[mv_table[xy][1] + MAX_MV] == 0){
                if(mv_table[xy][1]>0) mv_table[xy][1]=  (16<<f_code)-1;
                else                  mv_table[xy][1]= -(16<<f_code);
            }
            xy++;
            i++;
        }
    }