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

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

Author: barz
Date: Wed Nov  8 03:04:10 2006
New Revision: 3909

Removed:
   vic/branches/mpeg4/codec/mpeg4.cpp
   vic/branches/mpeg4/codec/mpeg4.h
   vic/branches/mpeg4/codec/streambuffer.cpp
   vic/branches/mpeg4/codec/streambuffer.h
Modified:
   vic/branches/mpeg4/codec/encoder-h264.cpp
   vic/branches/mpeg4/codec/ffmpeg_codec.cpp
   vic/branches/mpeg4/codec/ffmpeg_codec.h
   vic/branches/mpeg4/codec/x264encoder.cpp

Log:


Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Wed Nov  8 03:04:10 2006
@@ -88,7 +88,7 @@
 
 void H264Encoder::size(int w, int h)
 {
-    printf("H264: WxH %dx%d\n", w, h);
+    debug_msg("H264: WxH %dx%d\n", w, h);
     Module::size(w, h);
     fIn = new DataBuffer(w * h * 3 >> 1);
     fOut = new DataBuffer(w * h * 3 >> 1);

Modified: vic/branches/mpeg4/codec/ffmpeg_codec.cpp
==============================================================================
--- vic/branches/mpeg4/codec/ffmpeg_codec.cpp	(original)
+++ vic/branches/mpeg4/codec/ffmpeg_codec.cpp	Wed Nov  8 03:04:10 2006
@@ -270,6 +270,7 @@
 
 void FFMpegCodec::set_gop(int gop_)
 {
+/*
     iframe_gap = gop_;
 
     if (state) {
@@ -283,6 +284,7 @@
 	    s->intra_only = 0;
 	}
     }
+*/
 }
 
 void FFMpegCodec::set_max_quantizer(int q)

Modified: vic/branches/mpeg4/codec/ffmpeg_codec.h
==============================================================================
--- vic/branches/mpeg4/codec/ffmpeg_codec.h	(original)
+++ vic/branches/mpeg4/codec/ffmpeg_codec.h	Wed Nov  8 03:04:10 2006
@@ -3,10 +3,15 @@
 
 extern "C"
 {
+#ifdef WIN32
+#include "ffmpeg_config.h"
+#else
 #include "ffmpeg/config.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
+#endif
+
+#include "ffmpeg/libavcodec/avcodec.h"
+//#include "ffmpeg/libavcodec/dsputil.h"
+//#include "ffmpeg/libavcodec/mpegvideo.h"
 }
 
 

Modified: vic/branches/mpeg4/codec/x264encoder.cpp
==============================================================================
--- vic/branches/mpeg4/codec/x264encoder.cpp	(original)
+++ vic/branches/mpeg4/codec/x264encoder.cpp	Wed Nov  8 03:04:10 2006
@@ -6,8 +6,8 @@
 
 extern "C"
 {
-#include "common/common.h"
-#include "x264.h"
+#include "x264/common/common.h"
+#include "x264/x264.h"
 }
 
 #include "databuffer.h"