comparison motion_est.c @ 2986:83934bcab3cc libavcodec

hmm did i mess the scaling of these up at some point? anyway, this change decreases bitrate and increase PSNR by ~1.00 on my test file, other files also benefit significantly

2985:7de97d3ac7ef

        if(vard<c->avctx->me_threshold){
            pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard;
            c->mc_mb_var_sum_temp += vard;
            if (vard <= 64 || vard < varc) { //FIXME
                c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
            }else{
                c->scene_change_score+= s->qscale;
            }
            return;
        }

    printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
           varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
#endif
    if(mb_type){
        if (vard <= 64 || vard < varc)
            c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
        else
            c->scene_change_score+= s->qscale;

        if(mb_type == CANDIDATE_MB_TYPE_INTER){
            c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16);

        if(mb_type == CANDIDATE_MB_TYPE_INTER_I){
            interlaced_search(s, 0, s->p_field_mv_table, s->p_field_select_table, mx, my, 1);
        }
    }else if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){
        if (vard <= 64 || vard < varc)
            c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
        else
            c->scene_change_score+= s->qscale;

        if (vard*2 + 200 > varc)
            mb_type|= CANDIDATE_MB_TYPE_INTRA;

            s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= CANDIDATE_MB_TYPE_INTRA; //FIXME cleanup
        }else
            s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= 0;

        if (vard <= 64 || vard < varc) { //FIXME
            c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
        }else{
            c->scene_change_score+= s->qscale;
        }
    }

             s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = vard;
/*            pic->mb_mean  [s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
            c->mb_var_sum_temp    += varc;*/
            c->mc_mb_var_sum_temp += vard;
/*            if (vard <= 64 || vard < varc) {
                c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
            }else{
                c->scene_change_score+= s->qscale;
            }*/
            return;
        }

2986:83934bcab3cc

        if(vard<c->avctx->me_threshold){
            pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard;
            c->mc_mb_var_sum_temp += vard;
            if (vard <= 64 || vard < varc) { //FIXME
                c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8);
            }else{
                c->scene_change_score+= s->qscale;
            }
            return;
        }

    printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
           varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
#endif
    if(mb_type){
        if (vard <= 64 || vard < varc)
            c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8);
        else
            c->scene_change_score+= s->qscale;

        if(mb_type == CANDIDATE_MB_TYPE_INTER){
            c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16);

        if(mb_type == CANDIDATE_MB_TYPE_INTER_I){
            interlaced_search(s, 0, s->p_field_mv_table, s->p_field_select_table, mx, my, 1);
        }
    }else if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){
        if (vard <= 64 || vard < varc)
            c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8);
        else
            c->scene_change_score+= s->qscale;

        if (vard*2 + 200 > varc)
            mb_type|= CANDIDATE_MB_TYPE_INTRA;

            s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= CANDIDATE_MB_TYPE_INTRA; //FIXME cleanup
        }else
            s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= 0;

        if (vard <= 64 || vard < varc) { //FIXME
            c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8);
        }else{
            c->scene_change_score+= s->qscale;
        }
    }

             s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = vard;
/*            pic->mb_mean  [s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
            c->mb_var_sum_temp    += varc;*/
            c->mc_mb_var_sum_temp += vard;
/*            if (vard <= 64 || vard < varc) {
                c->scene_change_score+= ff_sqrt(vard<<8) - ff_sqrt(varc<<8);
            }else{
                c->scene_change_score+= s->qscale;
            }*/
            return;
        }