[xiph-commits] r13918 - in trunk/theora: lib lib/enc/x86_64
win32/VS2005 win32/VS2005/dump_video win32/VS2005/encoder_example
sping at svn.xiph.org
sping at svn.xiph.org
Tue Oct 2 10:39:22 PDT 2007
Author: sping
Date: 2007-10-02 10:39:22 -0700 (Tue, 02 Oct 2007)
New Revision: 13918
Modified:
trunk/theora/lib/enc/x86_64/dsp_mmx.c
trunk/theora/lib/enc/x86_64/dsp_mmxext.c
trunk/theora/lib/enc/x86_64/fdct_mmx.c
trunk/theora/lib/enc/x86_64/recon_mmx.c
trunk/theora/lib/internal.h
trunk/theora/win32/VS2005/dump_video/
trunk/theora/win32/VS2005/dump_video/dump_video.vcproj
trunk/theora/win32/VS2005/encoder_example/
trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
trunk/theora/win32/VS2005/theora.sln
Log:
- include and link fixes
- USE_ASM and (unused) THEORA_USE_ASM disabled
- no more debug info in release builds
- #error message added in consensus with derf and maikmerten
(consensus was adding it, not the actual text. please modify if necessary.)
- fully commit the four items before this time, sorry
- fix and integrate <dump_video> and <encoder_example> project files
Modified: trunk/theora/lib/enc/x86_64/dsp_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/dsp_mmx.c 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/lib/enc/x86_64/dsp_mmx.c 2007-10-02 17:39:22 UTC (rev 13918)
@@ -15,6 +15,8 @@
********************************************************************/
+#ifdef USE_ASM
+
#include <stdlib.h>
#include "codec_internal.h"
@@ -299,3 +301,4 @@
funcs->inter8x8_err = inter8x8_err__mmx;
}
+#endif /* USE_ASM */
Modified: trunk/theora/lib/enc/x86_64/dsp_mmxext.c
===================================================================
--- trunk/theora/lib/enc/x86_64/dsp_mmxext.c 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/lib/enc/x86_64/dsp_mmxext.c 2007-10-02 17:39:22 UTC (rev 13918)
@@ -15,6 +15,8 @@
********************************************************************/
+#ifdef USE_ASM
+
#include <stdlib.h>
#include "codec_internal.h"
@@ -318,3 +320,5 @@
funcs->sad8x8_xy2_thres = sad8x8_xy2_thres__mmxext;
funcs->inter8x8_err_xy2 = inter8x8_err_xy2__mmxext;
}
+
+#endif /* USE_ASM */
Modified: trunk/theora/lib/enc/x86_64/fdct_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/fdct_mmx.c 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/lib/enc/x86_64/fdct_mmx.c 2007-10-02 17:39:22 UTC (rev 13918)
@@ -13,6 +13,8 @@
/* mmx fdct implementation for x86_64 */
/* $Id$ */
+#ifdef USE_ASM
+
#include "theora/theora.h"
#include "codec_internal.h"
#include "dsp.h"
@@ -337,3 +339,5 @@
TH_DEBUG("enabling accelerated x86_64 mmx fdct function.\n");
funcs->fdct_short = fdct_short__mmx;
}
+
+#endif /* USE_ASM */
Modified: trunk/theora/lib/enc/x86_64/recon_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/recon_mmx.c 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/lib/enc/x86_64/recon_mmx.c 2007-10-02 17:39:22 UTC (rev 13918)
@@ -15,6 +15,8 @@
********************************************************************/
+#ifdef USE_ASM
+
#include "codec_internal.h"
typedef unsigned long long ogg_uint64_t;
@@ -180,3 +182,4 @@
funcs->recon_inter8x8_half = recon_inter8x8_half__mmx;
}
+#endif /* USE_ASM */
Modified: trunk/theora/lib/internal.h
===================================================================
--- trunk/theora/lib/internal.h 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/lib/internal.h 2007-10-02 17:39:22 UTC (rev 13918)
@@ -487,4 +487,15 @@
oc_state_granule_time_func granule_time;
};
+#if defined(_MSC_VER) && !defined(TH_REALLY_NO_ASSEMBLY)
+# error You are compiling theora without inline assembly.\
+ This is probably not what you want. Instead, please either\
+ (1) download the assembly .lib binaries or\
+ (2) compile them yourself using MinGW, and make Visual Studio\
+ link against them.\
+ Please seriously consider this before defining TH_REALLY_NO_ASSEMBLY\
+ to disable this message and compile without inline assembly.\
+ Thank you!
#endif
+
+#endif
Property changes on: trunk/theora/win32/VS2005/dump_video
___________________________________________________________________
Name: svn:ignore
- Debug
*.user
+ Debug
*.user
Release
Modified: trunk/theora/win32/VS2005/dump_video/dump_video.vcproj
===================================================================
--- trunk/theora/win32/VS2005/dump_video/dump_video.vcproj 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/win32/VS2005/dump_video/dump_video.vcproj 2007-10-02 17:39:22 UTC (rev 13918)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="dump_video"
ProjectGUID="{1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}"
RootNamespace="dump_video"
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -61,7 +61,9 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="libogg.lib libtheora.lib"
LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2005\debug;..\debug;"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -116,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
+ AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -135,8 +137,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="libogg.lib libtheora.lib"
LinkIncremental="1"
- GenerateDebugInformation="true"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2005\release;..\release;"
+ GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -171,44 +175,26 @@
<References>
</References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ <File
+ RelativePath="..\..\..\examples\dump_video.c"
>
- <File
- RelativePath="..\..\..\examples\dump_video.c"
- >
- </File>
- <File
- RelativePath="..\..\getopt.c"
- >
- </File>
- <File
- RelativePath="..\..\getopt1.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ </File>
+ <File
+ RelativePath="..\..\getopt.c"
>
- <File
- RelativePath="..\..\..\examples\getopt.h"
- >
- </File>
- <File
- RelativePath="..\..\getopt_win.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ </File>
+ <File
+ RelativePath="..\..\..\examples\getopt.h"
>
- </Filter>
+ </File>
+ <File
+ RelativePath="..\..\getopt1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\getopt_win.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Property changes on: trunk/theora/win32/VS2005/encoder_example
___________________________________________________________________
Name: svn:ignore
- Debug
*.user
+ Debug
*.user
Release
Modified: trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
===================================================================
--- trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj 2007-10-02 17:39:22 UTC (rev 13918)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="encoder_example"
ProjectGUID="{AD710263-EBFA-4388-BAA9-AD73C32AFF26}"
RootNamespace="encoder_example"
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\..\libvorbis\include"
+ AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\..\libvorbis\include;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -48,7 +48,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -61,7 +61,9 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="libogg.lib libvorbis.lib libtheora.lib"
LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2005\debug;..\..\..\..\libvorbis\win32\VS2005\debug;..\debug;"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -119,13 +121,13 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\..\libvorbis\include"
+ AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\..\libvorbis\include;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -138,7 +140,9 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="libogg.lib libvorbis.lib libtheora.lib"
LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\libogg\win32\VS2005\release;..\..\..\..\libvorbis\win32\VS2005\release;..\release;"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -175,36 +179,18 @@
<References>
</References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ <File
+ RelativePath="..\..\..\examples\encoder_example.c"
>
- <File
- RelativePath="..\..\..\examples\encoder_example.c"
- >
- </File>
- <File
- RelativePath="..\..\getopt.c"
- >
- </File>
- <File
- RelativePath="..\..\getopt1.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ </File>
+ <File
+ RelativePath="..\..\getopt.c"
>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ </File>
+ <File
+ RelativePath="..\..\getopt1.c"
>
- </Filter>
+ </File>
</Files>
<Globals>
</Globals>
Modified: trunk/theora/win32/VS2005/theora.sln
===================================================================
--- trunk/theora/win32/VS2005/theora.sln 2007-10-02 15:32:07 UTC (rev 13917)
+++ trunk/theora/win32/VS2005/theora.sln 2007-10-02 17:39:22 UTC (rev 13918)
@@ -2,6 +2,10 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "libtheora\libtheora.vcproj", "{653F3841-3F26-49B9-AFCF-091DB4B67031}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dump_video", "dump_video\dump_video.vcproj", "{1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder_example", "encoder_example\encoder_example.vcproj", "{AD710263-EBFA-4388-BAA9-AD73C32AFF26}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_RTL_dll|Win32 = Debug_RTL_dll|Win32
@@ -24,6 +28,30 @@
{653F3841-3F26-49B9-AFCF-091DB4B67031}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32
{653F3841-3F26-49B9-AFCF-091DB4B67031}.Release|Win32.ActiveCfg = Release|Win32
{653F3841-3F26-49B9-AFCF-091DB4B67031}.Release|Win32.Build.0 = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Debug|Win32.Build.0 = Debug|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_RTL_dll|Win32.Build.0 = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_SSE|Win32.ActiveCfg = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_SSE|Win32.Build.0 = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_SSE2|Win32.ActiveCfg = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release_SSE2|Win32.Build.0 = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release|Win32.ActiveCfg = Release|Win32
+ {1A8CA99D-B6C7-48CB-B263-6CECDADF5FBF}.Release|Win32.Build.0 = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Debug|Win32.Build.0 = Debug|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_RTL_dll|Win32.Build.0 = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_SSE|Win32.ActiveCfg = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_SSE|Win32.Build.0 = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_SSE2|Win32.ActiveCfg = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release_SSE2|Win32.Build.0 = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release|Win32.ActiveCfg = Release|Win32
+ {AD710263-EBFA-4388-BAA9-AD73C32AFF26}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
More information about the commits
mailing list