[MPlayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.111,1.112

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv21224/libmpcodecs

Modified Files:
	ve_lavc.c 
Log Message:
35% faster turbo mode with 0.01dB drop. Based Loren Merritt's suggestions.
Next step would be to make turbo mode accept a "quality" argument to control the
speed vs quality tradeoff.


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ve_lavc.c	1 Mar 2005 20:21:58 -0000	1.111
+++ ve_lavc.c	2 Mar 2005 19:28:42 -0000	1.112
@@ -678,14 +678,12 @@
 
 	  /* Disables diamond motion estimation */
 	  lavc_venc_context->pre_dia_size = 0;
-	  lavc_venc_context->dia_size = 0;
+	  lavc_venc_context->dia_size = 1;
 
 	  lavc_venc_context->quantizer_noise_shaping = 0; // qns=0
 	  lavc_venc_context->noise_reduction = 0; // nr=0
+	  lavc_venc_context->mb_decision = 0; // mbd=0 ("realtime" encoding)
 
-	  if (lavc_param_mb_decision) {
-	    lavc_venc_context->mb_decision = 1; // mbd=0 ("realtime" encoding)
-	  }
 	  lavc_venc_context->flags &= ~CODEC_FLAG_QPEL;
 	  lavc_venc_context->flags &= ~CODEC_FLAG_4MV;
 	  lavc_venc_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;