[Sumover-dev] [svn commit] r4539 - vic/branches/mpeg4/codec

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Dec  8 16:38:21 2009
New Revision: 4539

Modified:
   vic/branches/mpeg4/codec/encoder-h264.cpp
   vic/branches/mpeg4/codec/x264encoder.cpp

Log:
Modifications for x264 - the GOP setting was moved as it needs to be set before init is called. Added missing header file. Disabled the PSNR code - should speed up H.264 codec somewhat. 

Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Tue Dec  8 16:38:21 2009
@@ -150,8 +150,8 @@
 	    state = true;
 	    size(vf->width_, vf->height_);
 	    debug_msg("init x264 encoder with kbps:%d, fps:%d", kbps, fps);
-	    enc->init(vf->width_, vf->height_, kbps, fps);
 	    enc->setGOP(gop);
+	    enc->init(vf->width_, vf->height_, kbps, fps);
 	    frame_size = vf->width_ * vf->height_;
     }
 

Modified: vic/branches/mpeg4/codec/x264encoder.cpp
==============================================================================
--- vic/branches/mpeg4/codec/x264encoder.cpp	(original)
+++ vic/branches/mpeg4/codec/x264encoder.cpp	Tue Dec  8 16:38:21 2009
@@ -8,6 +8,7 @@
 #include "libavcodec/avcodec.h"
 #include "databuffer.h"
 extern "C"{
+#include "inttypes.h"
 #include "x264.h"
 }
 
@@ -60,7 +61,7 @@
     param->b_cabac = 0;
     
     //DONOT ENABLE PSNR ANALYSE
-    param->analyse.b_psnr = 1;
+    //param->analyse.b_psnr = 1;
     
     param->i_keyint_max = 50;
     param->i_keyint_min = 20;