[xiph-commits] r17114 - experimental/derf/theora-ptalarbvorm/lib

[gmaxwell at svn.xiph.org]

Author: gmaxwell
Date: 2010-04-03 13:18:48 -0700 (Sat, 03 Apr 2010)
New Revision: 17114

Modified:
   experimental/derf/theora-ptalarbvorm/lib/analyze.c
Log:
Simple change to avoide the motion-estimation search on INTRA when it will be completely useless (the no-mc speed level and keyframe frequency==1). Speeds up the -k1 case by a couple percent.

Modified: experimental/derf/theora-ptalarbvorm/lib/analyze.c
===================================================================
--- experimental/derf/theora-ptalarbvorm/lib/analyze.c	2010-04-03 19:03:34 UTC (rev 17113)
+++ experimental/derf/theora-ptalarbvorm/lib/analyze.c	2010-04-03 20:18:48 UTC (rev 17114)
@@ -1668,9 +1668,12 @@
          activity,activity_avg,luma,luma_avg);
         luma_sum+=luma;
         /*Motion estimation:
-          We always do a basic 1MV search for all macroblocks, coded or not,
-           keyframe or not.*/
-        if(!_recode&&_enc->state.curframe_num>0)oc_mcenc_search(_enc,mbi);
+          We do a basic 1MV search for all macroblocks, coded or not,
+           keyframe or not, unless motion estimation is not being used at all*/
+        if(!_recode&&_enc->state.curframe_num>0&&
+         _enc->sp_level<OC_SP_LEVEL_NOMC&&_enc->keyframe_frequency_force>1){
+          oc_mcenc_search(_enc,mbi);
+        }
         oc_analyze_intra_mb_luma(_enc,pipe.qs+0,mbi,rd_scale);
         mb_modes[mbi]=OC_MODE_INTRA;
         oc_enc_mb_transform_quantize_intra_luma(_enc,&pipe,