[Ffmpeg-cvslog] r7202 - in trunk: libavcodec/motion_est_template.c tests/ffmpeg.regression.ref tests/libav.regression.ref tests/rotozoom.regression.ref

[Måns Rullgård]

michael <subversion at mplayerhq.hu> writes:

> Author: michael
> Date: Fri Dec  1 21:38:54 2006
> New Revision: 7202
>
> Modified:
>    trunk/libavcodec/motion_est_template.c
>    trunk/tests/ffmpeg.regression.ref
>    trunk/tests/libav.regression.ref
>    trunk/tests/rotozoom.regression.ref
>
> Log:
> remove pretty much useless skiping of some predictors
> this has pretty much no quality or speed effect except very small random changes
>
> Modified: trunk/libavcodec/motion_est_template.c
> ==============================================================================
> --- trunk/libavcodec/motion_est_template.c	(original)
> +++ trunk/libavcodec/motion_est_template.c	Fri Dec  1 21:38:54 2006
> @@ -976,13 +976,11 @@
>          CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)  , (P_MEDIAN[1]>>shift)+1)
>          CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)-1, (P_MEDIAN[1]>>shift)  )
>          CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)+1, (P_MEDIAN[1]>>shift)  )
> -        if(dmin>h*h*2){
>              CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
>                              (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
>              CHECK_MV(P_LEFT[0]    >>shift, P_LEFT[1]    >>shift)
>              CHECK_MV(P_TOP[0]     >>shift, P_TOP[1]     >>shift)
>              CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
> -        }
>      }
>      if(dmin>h*h*4){
>          if(c->pre_pass){
> @@ -1083,14 +1081,12 @@
>      }else{
>          CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift)
>          //FIXME try some early stop
> -        if(dmin>64*2){
>              CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift)
>              CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
>              CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift)
>              CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
>              CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
>                              (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
> -        }
>      }
>      if(dmin>64*4){
>          CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16,
> @@ -1145,14 +1141,12 @@
>      }else{
>          CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift)
>          //FIXME try some early stop
> -        if(dmin>64*2){
>              CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift)
>              CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
>              CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift)
>              CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
>              CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
>                              (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
> -        }
>      }
>      if(dmin>64*4){
>          CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16,

Please fix indentation.

-- 
M?ns Rullg?rd
mru at inprovide.com