[xiph-commits] r11211 - in trunk/Tremor: . win32 win32/VS2005
win32/VS2005/libtremor
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Fri Apr 21 11:32:54 PDT 2006
Author: illiminable
Date: 2006-04-21 11:32:44 -0700 (Fri, 21 Apr 2006)
New Revision: 11211
Added:
trunk/Tremor/win32/
trunk/Tremor/win32/VS2005/
trunk/Tremor/win32/VS2005/libtremor/
trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj
Modified:
trunk/Tremor/codebook.c
trunk/Tremor/floor0.c
trunk/Tremor/misc.h
Log:
* Use the provided STIN macros so it builds on win32
* Add VS2005 project files
Modified: trunk/Tremor/codebook.c
===================================================================
--- trunk/Tremor/codebook.c 2006-04-21 17:59:10 UTC (rev 11210)
+++ trunk/Tremor/codebook.c 2006-04-21 18:32:44 UTC (rev 11211)
@@ -147,7 +147,7 @@
return((x>> 1)&0x55555555) | ((x<< 1)&0xaaaaaaaa);
}
-static inline long decode_packed_entry_number(codebook *book,
+STIN long decode_packed_entry_number(codebook *book,
oggpack_buffer *b){
int read=book->dec_maxlength;
long lo,hi;
Modified: trunk/Tremor/floor0.c
===================================================================
--- trunk/Tremor/floor0.c 2006-04-21 17:59:10 UTC (rev 11210)
+++ trunk/Tremor/floor0.c 2006-04-21 18:32:44 UTC (rev 11211)
@@ -48,7 +48,7 @@
returns in m.8 format */
static long ADJUST_SQRT2[2]={8192,5792};
-static inline ogg_int32_t vorbis_invsqlook_i(long a,long e){
+STIN ogg_int32_t vorbis_invsqlook_i(long a,long e){
long i=(a&0x7fff)>>(INVSQ_LOOKUP_I_SHIFT-1);
long d=a&INVSQ_LOOKUP_I_MASK; /* 0.10 */
long val=INVSQ_LOOKUP_I[i]- /* 1.16 */
@@ -60,7 +60,7 @@
/* interpolated lookup based fromdB function, domain -140dB to 0dB only */
/* a is in n.12 format */
-static inline ogg_int32_t vorbis_fromdBlook_i(long a){
+STIN ogg_int32_t vorbis_fromdBlook_i(long a){
int i=(-a)>>(12-FROMdB2_SHIFT);
if(i<0) return 0x7fffffff;
if(i>=(FROMdB_LOOKUP_SZ<<FROMdB_SHIFT))return 0;
@@ -70,7 +70,7 @@
/* interpolated lookup based cos function, domain 0 to PI only */
/* a is in 0.16 format, where 0==0, 2^^16-1==PI, return 0.14 */
-static inline ogg_int32_t vorbis_coslook_i(long a){
+STIN ogg_int32_t vorbis_coslook_i(long a){
int i=a>>COS_LOOKUP_I_SHIFT;
int d=a&COS_LOOKUP_I_MASK;
return COS_LOOKUP_I[i]- ((d*(COS_LOOKUP_I[i]-COS_LOOKUP_I[i+1]))>>
@@ -79,7 +79,7 @@
/* interpolated lookup based cos function */
/* a is in 0.16 format, where 0==0, 2^^16==PI, return .LSP_FRACBITS */
-static inline ogg_int32_t vorbis_coslook2_i(long a){
+STIN ogg_int32_t vorbis_coslook2_i(long a){
a=a&0x1ffff;
if(a>0x10000)a=0x20000-a;
@@ -102,7 +102,7 @@
};
/* used in init only; interpolate the long way */
-static inline ogg_int32_t toBARK(int n){
+STIN ogg_int32_t toBARK(int n){
int i;
for(i=0;i<27;i++)
if(n>=barklook[i] && n<barklook[i+1])break;
Modified: trunk/Tremor/misc.h
===================================================================
--- trunk/Tremor/misc.h 2006-04-21 17:59:10 UTC (rev 11210)
+++ trunk/Tremor/misc.h 2006-04-21 18:32:44 UTC (rev 11211)
@@ -51,17 +51,17 @@
};
#endif
-static inline ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
union magic magic;
magic.whole = (ogg_int64_t)x * y;
return magic.halves.hi;
}
-static inline ogg_int32_t MULT31(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT31(ogg_int32_t x, ogg_int32_t y) {
return MULT32(x,y)<<1;
}
-static inline ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) {
union magic magic;
magic.whole = (ogg_int64_t)x * y;
return ((ogg_uint32_t)(magic.halves.lo)>>15) | ((magic.halves.hi)<<17);
@@ -83,15 +83,15 @@
* tables in this case.
*/
-static inline ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
return (x >> 9) * y; /* y preshifted >>23 */
}
-static inline ogg_int32_t MULT31(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT31(ogg_int32_t x, ogg_int32_t y) {
return (x >> 8) * y; /* y preshifted >>23 */
}
-static inline ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) {
+STIN ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) {
return (x >> 6) * y; /* y preshifted >>9 */
}
@@ -128,7 +128,7 @@
#else
-static inline void XPROD32(ogg_int32_t a, ogg_int32_t b,
+STIN void XPROD32(ogg_int32_t a, ogg_int32_t b,
ogg_int32_t t, ogg_int32_t v,
ogg_int32_t *x, ogg_int32_t *y)
{
@@ -136,7 +136,7 @@
*y = MULT32(b, t) - MULT32(a, v);
}
-static inline void XPROD31(ogg_int32_t a, ogg_int32_t b,
+STIN void XPROD31(ogg_int32_t a, ogg_int32_t b,
ogg_int32_t t, ogg_int32_t v,
ogg_int32_t *x, ogg_int32_t *y)
{
@@ -144,7 +144,7 @@
*y = MULT31(b, t) - MULT31(a, v);
}
-static inline void XNPROD31(ogg_int32_t a, ogg_int32_t b,
+STIN void XNPROD31(ogg_int32_t a, ogg_int32_t b,
ogg_int32_t t, ogg_int32_t v,
ogg_int32_t *x, ogg_int32_t *y)
{
@@ -159,7 +159,7 @@
#ifndef _V_CLIP_MATH
#define _V_CLIP_MATH
-static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
+STIN ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
int ret=x;
ret-= ((x<=32767)-1)&(x-32767);
ret-= ((x>=-32768)-1)&(x+32768);
@@ -168,7 +168,7 @@
#endif
-static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap,
+STIN ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap,
ogg_int32_t b,ogg_int32_t bp,
ogg_int32_t *p){
if(a && b){
@@ -185,7 +185,7 @@
int _ilog(unsigned int);
-static inline ogg_int32_t VFLOAT_MULTI(ogg_int32_t a,ogg_int32_t ap,
+STIN ogg_int32_t VFLOAT_MULTI(ogg_int32_t a,ogg_int32_t ap,
ogg_int32_t i,
ogg_int32_t *p){
@@ -193,7 +193,7 @@
return VFLOAT_MULT(a,ap,i<<-ip,ip,p);
}
-static inline ogg_int32_t VFLOAT_ADD(ogg_int32_t a,ogg_int32_t ap,
+STIN ogg_int32_t VFLOAT_ADD(ogg_int32_t a,ogg_int32_t ap,
ogg_int32_t b,ogg_int32_t bp,
ogg_int32_t *p){
Added: trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj
===================================================================
--- trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj 2006-04-21 17:59:10 UTC (rev 11210)
+++ trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj 2006-04-21 18:32:44 UTC (rev 11211)
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libtremor"
+ ProjectGUID="{7A8E774E-DD94-43B8-8758-6F9F656CC8D2}"
+ RootNamespace="libtremor"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <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="..\..\..\bitwise.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\block.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\codebook.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\floor0.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\floor1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\framing.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\mapping0.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\mdct.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\registry.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\res012.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\sharedbook.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\synthesis.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\window.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\backends.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\block.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\codebook.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\codec_internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\config_types.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\ivorbiscodec.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\ivorbisfile.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\lsp_lookup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\mdct.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\mdct_lookup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\misc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\ogg.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\os.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\os_types.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\registry.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\window.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\window_lookup.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}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
More information about the commits
mailing list