[Sumover-dev] [svn commit] r3928 - in vic/branches/mpeg4: codec render win32/lib

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

Author: barz
Date: Tue Nov 14 05:59:27 2006
New Revision: 3928

Modified:
   vic/branches/mpeg4/codec/encoder-h264.cpp
   vic/branches/mpeg4/codec/x264encoder.cpp
   vic/branches/mpeg4/config_arch.h
   vic/branches/mpeg4/render/color-swscale.cpp
   vic/branches/mpeg4/vic.vcproj
   vic/branches/mpeg4/win32/lib/avcodec.dll
   vic/branches/mpeg4/win32/lib/avcodec.lib

Log:


Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Tue Nov 14 05:59:27 2006
@@ -4,7 +4,12 @@
 #include <math.h>
 #include <errno.h>
 #include <assert.h>
+#ifdef _WIN32
+#include <time.h>
+#else
 #include <sys/time.h>
+#endif
+
 #include "inet.h"
 #include "net.h"
 #include "rtp.h"

Modified: vic/branches/mpeg4/codec/x264encoder.cpp
==============================================================================
--- vic/branches/mpeg4/codec/x264encoder.cpp	(original)
+++ vic/branches/mpeg4/codec/x264encoder.cpp	Tue Nov 14 05:59:27 2006
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 #include <inttypes.h>
 #include "ffmpeg/avcodec.h"
 extern "C"

Modified: vic/branches/mpeg4/config_arch.h
==============================================================================
--- vic/branches/mpeg4/config_arch.h	(original)
+++ vic/branches/mpeg4/config_arch.h	Tue Nov 14 05:59:27 2006
@@ -5,9 +5,8 @@
 #ifndef __POSTPROC_CONFIG_H__
 #define __POSTPROC_CONFIG_H__ 1
 
-#define HAVE_SWSCALE
-#define __CPU__ 586
-#define ARCH_X86 1
+// #define __CPU__ 586
+// #define ARCH_X86 1
 
 /* Runtime CPU detection */
 #define HAVE_MMX
@@ -28,7 +27,7 @@
 #define USE_FASTMEMCPY 1
 
 /* Use libswscale */
-#define HAVE_SWSCALE
+// #define HAVE_SWSCALE
 
 /* attribute(used) as needed by some compilers */
 #if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300)

Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Tue Nov 14 05:59:27 2006
@@ -6,10 +6,15 @@
 #include "renderer.h"
 
 #include "config_arch.h"
+#ifdef WIN32
+#undef ARCH_X86
+// #include "ffmpeg_config.h"
+#endif
 #include "ffmpeg/swscale.h"
 #include "ffmpeg/avutil.h"
 #include "linux/cpudetect.h"
 
+
 #ifdef HAVE_SWSCALE 
 
 class X11WindowRenderer : public WindowDitherer {
@@ -23,18 +28,18 @@
 	  switch (depth_) {
 	    case 15:
 	    case 16:
-		printf("16\n");
+			// printf("16\n");
 	        out_format = PIX_FMT_RGB565;
 	        bytes_per_pixel	= 2;
 	    	break;
 	    	
 	    case 24:
-		printf("24\n");
-		out_format = PIX_FMT_RGB24;
-		bytes_per_pixel = 3;
-		break;
+		//	printf("24\n");
+			out_format = PIX_FMT_RGB24;
+			bytes_per_pixel = 3;
+			break;
 	    case 32:
-		printf("32\n");
+			// printf("32\n");
 	        out_format = PIX_FMT_RGB32;
 	        bytes_per_pixel	= 4;
   	  }

Modified: vic/branches/mpeg4/vic.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.vcproj	(original)
+++ vic/branches/mpeg4/vic.vcproj	Tue Nov 14 05:59:27 2006
@@ -482,7 +482,7 @@
 				AdditionalOptions="/I ../common"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\,render,rtp,net,win32,video,codec,codec\tmndec,codec\tmn-x,codec\jpeg,codec\p64,codec\h263,codec\mpeg,..\common\src,..\tk-8.0\win,..\tcl-8.0\win,..\tk-8.0\generic,..\tk-8.0\xlib,..\tcl-8.0\generic,..\IPv6Kit\inc,mst_wm\incls"
-				PreprocessorDefinitions="HAVE_AV_CONFIG_H;__X264__;DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6"
+				PreprocessorDefinitions="__X264__;DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6"
 				RuntimeLibrary="5"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug_IPv6_Win2000/vic.pch"
@@ -11717,6 +11717,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\render\color-hi.cpp">
+			</File>
+			<File
 				RelativePath="render\color-hist.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -12012,6 +12015,9 @@
 				RelativePath=".\render\color-swscale.cpp">
 			</File>
 			<File
+				RelativePath=".\render\color-true.cpp">
+			</File>
+			<File
 				RelativePath="render\color-yuv.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">

Modified: vic/branches/mpeg4/win32/lib/avcodec.dll
==============================================================================
Binary files. No diff available.

Modified: vic/branches/mpeg4/win32/lib/avcodec.lib
==============================================================================
Binary files. No diff available.