diff --git a/.travis.yml b/.travis.yml index b738676a..0e1e2a5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,12 @@ language: cpp compiler: - gcc - clang -# Change this to your needs +branches: + except: + - gh-pages before_install: - sudo apt-get update -qq - sudo apt-get install -qq g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev -script: make gtest-bootstrap && make && make test +install: make gtest-bootstrap +script: make && make test && make clean && make ENABLE64BIT=Yes && make test diff --git a/Makefile b/Makefile index 6012c780..58d27080 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,20 @@ endif # Configurations ifeq ($(BUILDTYPE), Release) CFLAGS += -O3 +ifneq ($(ENABLE64BIT), Yes) USE_ASM = Yes +endif else CFLAGS = -g USE_ASM = No endif - +ifeq ($(ENABLE64BIT), Yes) +CFLAGS += -m64 +LDFLAGS += -m64 +else +CFLAGS += -m32 +LDFLAGS += -m32 +endif include build/platform-$(UNAME).mk ifeq ($(USE_ASM),Yes) diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index 6c045dea..9ac8283f 100644 --- a/build/platform-darwin.mk +++ b/build/platform-darwin.mk @@ -1,5 +1,5 @@ USE_ASM = No # We don't have ASM working on Mac yet ASM = nasm -CFLAGS += -arch i386 -fPIC -LDFLAGS += -arch i386 -ldl -lpthread +CFLAGS += -fPIC +LDFLAGS += -lpthread ASMFLAGS += -f macho --prefix _ diff --git a/build/platform-freebsd.mk b/build/platform-freebsd.mk new file mode 100644 index 00000000..daf0d564 --- /dev/null +++ b/build/platform-freebsd.mk @@ -0,0 +1,5 @@ +ASM = nasm +CFLAGS += -fPIC +LDFLAGS += -lpthread +ASMFLAGS += -f elf + diff --git a/build/platform-linux.mk b/build/platform-linux.mk index d9ba9459..e09b2add 100644 --- a/build/platform-linux.mk +++ b/build/platform-linux.mk @@ -1,5 +1,5 @@ ASM = nasm -CFLAGS += -m32 -fPIC -DLINUX -D__NO_CTYPE -LDFLAGS += -m32 -ldl -lpthread +CFLAGS += -fPIC -DLINUX -D__NO_CTYPE +LDFLAGS += -lpthread ASMFLAGS += -f elf diff --git a/codec/WelsThreadLib/api/WelsThreadLib.h b/codec/WelsThreadLib/api/WelsThreadLib.h index 1a184a3e..dd93e1f2 100644 --- a/codec/WelsThreadLib/api/WelsThreadLib.h +++ b/codec/WelsThreadLib/api/WelsThreadLib.h @@ -47,7 +47,7 @@ extern "C" { #endif -#if defined(WIN32) +#if defined(_WIN32) #include @@ -88,7 +88,7 @@ typedef sem_t WELS_EVENT; #endif//__GNUC__ -#endif//WIN32 +#endif//_WIN32 typedef int32_t WELS_THREAD_ERROR_CODE; typedef int32_t WELS_THREAD_ATTR; @@ -119,7 +119,7 @@ WELS_THREAD_ERROR_CODE WelsEventSignal (WELS_EVENT* event); WELS_THREAD_ERROR_CODE WelsEventReset (WELS_EVENT* event); WELS_THREAD_ERROR_CODE WelsEventWait (WELS_EVENT* event); WELS_THREAD_ERROR_CODE WelsEventWaitWithTimeOut (WELS_EVENT* event, uint32_t dwMilliseconds); -#ifdef WIN32 +#ifdef _WIN32 WELS_THREAD_ERROR_CODE WelsMultipleEventsWaitSingleBlocking (uint32_t nCount, WELS_EVENT* event_list, uint32_t dwMilliseconds); WELS_THREAD_ERROR_CODE WelsMultipleEventsWaitAllBlocking (uint32_t nCount, WELS_EVENT* event_list); @@ -127,7 +127,7 @@ WELS_THREAD_ERROR_CODE WelsMultipleEventsWaitAllBlocking (uint32_t nCount, WE WELS_THREAD_ERROR_CODE WelsMultipleEventsWaitSingleBlocking (uint32_t nCount, WELS_EVENT** event_list, uint32_t dwMilliseconds); WELS_THREAD_ERROR_CODE WelsMultipleEventsWaitAllBlocking (uint32_t nCount, WELS_EVENT** event_list); -#endif//WIN32 +#endif//_WIN32 WELS_THREAD_ERROR_CODE WelsThreadCreate (WELS_THREAD_HANDLE* thread, LPWELS_THREAD_ROUTINE routine, void* arg, WELS_THREAD_ATTR attr); diff --git a/codec/WelsThreadLib/src/WelsThreadLib.cpp b/codec/WelsThreadLib/src/WelsThreadLib.cpp index e44ef1e6..788bf873 100644 --- a/codec/WelsThreadLib/src/WelsThreadLib.cpp +++ b/codec/WelsThreadLib/src/WelsThreadLib.cpp @@ -42,7 +42,7 @@ #include "WelsThreadLib.h" #include -#ifdef WIN32 +#ifdef _WIN32 void WelsSleep (uint32_t dwMilliseconds) { Sleep (dwMilliseconds); diff --git a/codec/build/win32/dec/WelsDecCore.vcproj b/codec/build/win32/dec/WelsDecCore.vcproj index 30011c2f..7a0c3c07 100644 --- a/codec/build/win32/dec/WelsDecCore.vcproj +++ b/codec/build/win32/dec/WelsDecCore.vcproj @@ -4,12 +4,16 @@ Version="9.00" Name="WelsDecCore" ProjectGUID="{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}" + RootNamespace="WelsDecCore" TargetFrameworkVersion="0" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197,6 +360,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + @@ -204,6 +377,14 @@ Name="VCCustomBuildTool" /> + + + + + + @@ -226,6 +417,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -248,6 +459,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -270,6 +501,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -292,6 +543,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -314,6 +585,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -336,6 +627,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -358,6 +669,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -380,6 +711,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -402,6 +753,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + + + + @@ -424,6 +795,16 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5} @@ -19,11 +27,21 @@ false MultiByte + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + @@ -32,25 +50,45 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release .\..\..\..\obj\decoder\core\release\ + .\..\..\..\obj\decoder\core\release\ .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug .\..\..\..\obj\decoder\core\debug\ + .\..\..\..\obj\decoder\core\debug\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + welsdcore + welsdcore welsdcore + welsdcore @@ -83,6 +121,37 @@ $(OutDir)\WelsDecCore.bsc + + + MaxSpeed + OnlyExplicitInline + ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decoder\core\release/WelsDecCore.pch + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + Level3 + true + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib + true + + + true + $(OutDir)\WelsDecCore.bsc + + Disabled @@ -112,89 +181,200 @@ $(OutDir)\WelsDecCore.bsc + + + Disabled + ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decoder\core\debug/WelsDecCore.pch + .\..\..\..\obj\decoder\core\debug/ + .\..\..\..\obj\decoder\core\debug/ + .\..\..\..\obj\decoder\core\debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib + true + + + true + $(OutDir)\WelsDecCore.bsc + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/codec/build/win32/dec/WelsDecCore_2010.vcxproj.filters b/codec/build/win32/dec/WelsDecCore_2010.vcxproj.filters new file mode 100644 index 00000000..74a5ad88 --- /dev/null +++ b/codec/build/win32/dec/WelsDecCore_2010.vcxproj.filters @@ -0,0 +1,233 @@ + + + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {bd07938e-ee51-42b1-a4eb-c0214bb1b80c} + + + {7af56831-aabb-4f7a-8f01-751b02eb0417} + + + {2ca91ae4-7382-443d-9a13-d52c76d450de} + + + \ No newline at end of file diff --git a/codec/build/win32/dec/WelsDecCore_2012.vcxproj b/codec/build/win32/dec/WelsDecCore_2012.vcxproj index 7a1e5d7f..e3c61773 100644 --- a/codec/build/win32/dec/WelsDecCore_2012.vcxproj +++ b/codec/build/win32/dec/WelsDecCore_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5} @@ -20,12 +28,24 @@ false MultiByte + + StaticLibrary + v110 + false + MultiByte + StaticLibrary v110 false MultiByte + + StaticLibrary + v110 + false + MultiByte + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -47,11 +75,21 @@ .\..\..\..\obj\decoder\core\release\ welsdcore + + welsdcore + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decoder\core\release\ + .\..\..\..\..\bin\win32\Debug .\..\..\..\obj\decoder\core\debug\ welsdcore + + welsdcore + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\decoder\core\debug\ + MaxSpeed @@ -82,6 +120,37 @@ $(OutDir)\welsdcore.bsc + + + MaxSpeed + OnlyExplicitInline + ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decoder\core\release/WelsDecCore.pch + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + Level3 + true + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib + true + + + true + $(OutDir)\welsdcore.bsc + + Disabled @@ -111,89 +180,200 @@ $(OutDir)\welsdcore.bsc + + + Disabled + ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decoder\core\debug/WelsDecCore.pch + .\..\..\..\obj\decoder\core\debug/ + .\..\..\..\obj\decoder\core\debug/ + .\..\..\..\obj\decoder\core\debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib + true + + + true + $(OutDir)\welsdcore.bsc + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/codec/build/win32/dec/WelsDecCore_2012.vcxproj.filters b/codec/build/win32/dec/WelsDecCore_2012.vcxproj.filters new file mode 100644 index 00000000..0c26ede0 --- /dev/null +++ b/codec/build/win32/dec/WelsDecCore_2012.vcxproj.filters @@ -0,0 +1,233 @@ + + + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {5f3142f0-da92-4de5-ac73-a8879b60bc59} + + + {4d8b075e-fcf4-4f44-a4ee-0a1688dcd3e4} + + + {62810954-da7e-4245-b13b-a6b8a408eb0c} + + + \ No newline at end of file diff --git a/codec/build/win32/dec/WelsDecPlus.vcproj b/codec/build/win32/dec/WelsDecPlus.vcproj index e530eb45..fc452bfd 100644 --- a/codec/build/win32/dec/WelsDecPlus.vcproj +++ b/codec/build/win32/dec/WelsDecPlus.vcproj @@ -11,6 +11,9 @@ + @@ -115,6 +118,106 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -235,6 +435,15 @@ AdditionalIncludeDirectories="\SVN_project_https\trunk\codec\Wels\project\decoder\plus\res" /> + + + @@ -244,6 +453,15 @@ AdditionalIncludeDirectories="\SVN_project_https\trunk\codec\Wels\project\decoder\plus\res" /> + + + + + + @@ -275,6 +502,15 @@ PreprocessorDefinitions="" /> + + + + + + @@ -297,6 +542,15 @@ PreprocessorDefinitions="" /> + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF} @@ -20,11 +28,21 @@ false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + @@ -32,27 +50,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release .\..\..\..\obj\decoder\plus\Release\ + .\..\..\..\obj\decoder\plus\Release\ false + false .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug .\..\..\..\obj\decoder\plus\debug\ + .\..\..\..\obj\decoder\plus\debug\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + welsdec + welsdec welsdec + welsdec @@ -104,6 +144,54 @@ $(OutDir)\WelsDecPlus.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Release/WelsDecPlus.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decoder\plus\Release/WelsDecPlus.pch + .\..\..\..\obj\decoder\plus\Release/ + .\..\..\..\obj\decoder\plus\Release/ + .\..\..\..\obj\decoder\plus\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdec.dll + true + .\..\..\..\libs\Release\;%(AdditionalLibraryDirectories) + ..\..\..\decoder\plus\src\wels_dec_export.def + true + $(OutDir)\welsdec.pdb + true + $(OutDir)\welsdec.map + false + true + $(OutDir)\welsdec.lib + + + true + $(OutDir)\WelsDecPlus.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -151,12 +239,60 @@ $(OutDir)\WelsDecPlus.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Debug/WelsDecPlus.tlb + + + + + Disabled + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decoder\plus\debug/WelsDecPlus.pch + .\..\..\..\obj\decoder\plus\debug/ + .\..\..\..\obj\decoder\plus\debug/ + .\..\..\..\obj\decoder\plus\debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdec.dll + true + ..\..\..\libs\debug;%(AdditionalLibraryDirectories) + ..\..\..\decoder\plus\src\wels_dec_export.def + true + $(OutDir)\welsdec.pdb + false + true + $(OutDir)\welsdec.lib + + + true + $(OutDir)\WelsDecPlus.bsc + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) + \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) + \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) diff --git a/codec/build/win32/dec/WelsDecPlus_2010.vcxproj.filters b/codec/build/win32/dec/WelsDecPlus_2010.vcxproj.filters new file mode 100644 index 00000000..35984455 --- /dev/null +++ b/codec/build/win32/dec/WelsDecPlus_2010.vcxproj.filters @@ -0,0 +1,43 @@ + + + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + + + {d6373e35-6caa-469d-8491-2ef94d0b8d38} + + + {283e9710-8e76-440f-a854-02e561579b34} + + + {bcca5f5e-bd22-4546-bf12-5a6a29ed2eea} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj index 6c4cfffd..400128ae 100644 --- a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj +++ b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF} @@ -21,12 +29,24 @@ false MultiByte + + DynamicLibrary + v110 + false + MultiByte + DynamicLibrary v110 false MultiByte + + DynamicLibrary + v110 + false + MultiByte + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -48,12 +76,24 @@ false welsdec + + false + welsdec + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decoder\plus\Release\ + .\..\..\..\..\bin\win32\Debug .\..\..\..\obj\decoder\plus\debug\ false welsdec + + false + welsdec + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\decoder\plus\debug\ + NDEBUG;%(PreprocessorDefinitions) @@ -104,6 +144,55 @@ $(OutDir)\welsdec.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Release/WelsDecPlus.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decoder\plus\Release/WelsDecPlus.pch + .\..\..\..\obj\decoder\plus\Release/ + .\..\..\..\obj\decoder\plus\Release/ + .\..\..\..\obj\decoder\plus\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\..\..\..\bin\win64\Release\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdec.dll + true + .\..\..\..\libs\Release\;%(AdditionalLibraryDirectories) + ..\..\..\decoder\plus\src\wels_dec_export.def + true + $(OutDir)\welsdec.pdb + true + $(OutDir)\welsdec.map + false + true + $(OutDir)\welsdec.lib + $(OutDir)\welsdec.pgd + + + true + $(OutDir)\welsdec.bsc + + _DEBUG;%(PreprocessorDefinitions) @@ -152,10 +241,58 @@ $(OutDir)\welsdec.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Debug/WelsDecPlus.tlb + + + + + Disabled + ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decoder\plus\debug/WelsDecPlus.pch + .\..\..\..\obj\decoder\plus\debug/ + .\..\..\..\obj\decoder\plus\debug/ + .\..\..\..\obj\decoder\plus\debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\..\..\..\..\bin\win64\Debug\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdec.dll + true + ..\..\..\libs\debug;%(AdditionalLibraryDirectories) + ..\..\..\decoder\plus\src\wels_dec_export.def + true + $(OutDir)\welsdec.pdb + false + true + $(OutDir)\welsdec.lib + $(OutDir)\welsdec.map + $(OutDir)\welsdec.pgd + + + true + $(OutDir)\welsdec.bsc + + \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) + \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) + \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) diff --git a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj.filters b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj.filters new file mode 100644 index 00000000..7545f913 --- /dev/null +++ b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj.filters @@ -0,0 +1,43 @@ + + + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + + + {c04ef7c1-2921-4fc2-ab72-78d6c068fc4e} + + + {05890cc8-6bdd-466b-9305-cc37751c395d} + + + {c788e7f2-ede0-46b8-ada6-744b70f52f16} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/codec/build/win32/dec/WelsDecoder_2008.sln b/codec/build/win32/dec/WelsDecoder_2008.sln index 2d4cc388..d7aad3d6 100644 --- a/codec/build/win32/dec/WelsDecoder_2008.sln +++ b/codec/build/win32/dec/WelsDecoder_2008.sln @@ -16,21 +16,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.ActiveCfg = Debug|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.Build.0 = Debug|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.ActiveCfg = Debug|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.Build.0 = Debug|x64 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.ActiveCfg = Release|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.Build.0 = Release|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.ActiveCfg = Release|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.Build.0 = Release|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.ActiveCfg = Debug|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.Build.0 = Debug|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.ActiveCfg = Debug|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.Build.0 = Debug|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.ActiveCfg = Release|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.Build.0 = Release|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.ActiveCfg = Release|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.Build.0 = Release|x64 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.ActiveCfg = Debug|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.Build.0 = Debug|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.ActiveCfg = Debug|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.Build.0 = Debug|x64 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.ActiveCfg = Release|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.Build.0 = Release|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.ActiveCfg = Release|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/dec/WelsDecoder_2010.sln b/codec/build/win32/dec/WelsDecoder_2010.sln index 408d6a00..dffb57bc 100644 --- a/codec/build/win32/dec/WelsDecoder_2010.sln +++ b/codec/build/win32/dec/WelsDecoder_2010.sln @@ -16,21 +16,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.ActiveCfg = Debug|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.Build.0 = Debug|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.ActiveCfg = Debug|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.Build.0 = Debug|x64 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.ActiveCfg = Release|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.Build.0 = Release|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.ActiveCfg = Release|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.Build.0 = Release|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.ActiveCfg = Debug|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.Build.0 = Debug|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.ActiveCfg = Debug|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.Build.0 = Debug|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.ActiveCfg = Release|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.Build.0 = Release|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.ActiveCfg = Release|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.Build.0 = Release|x64 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.ActiveCfg = Debug|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.Build.0 = Debug|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.ActiveCfg = Debug|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.Build.0 = Debug|x64 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.ActiveCfg = Release|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.Build.0 = Release|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.ActiveCfg = Release|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/dec/WelsDecoder_2012.sln b/codec/build/win32/dec/WelsDecoder_2012.sln index 76928699..04f5af34 100644 --- a/codec/build/win32/dec/WelsDecoder_2012.sln +++ b/codec/build/win32/dec/WelsDecoder_2012.sln @@ -10,21 +10,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.ActiveCfg = Debug|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.Build.0 = Debug|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.ActiveCfg = Debug|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.Build.0 = Debug|x64 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.ActiveCfg = Release|Win32 {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.Build.0 = Release|Win32 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.ActiveCfg = Release|x64 + {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.Build.0 = Release|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.ActiveCfg = Debug|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.Build.0 = Debug|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.ActiveCfg = Debug|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.Build.0 = Debug|x64 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.ActiveCfg = Release|Win32 {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.Build.0 = Release|Win32 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.ActiveCfg = Release|x64 + {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.Build.0 = Release|x64 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.ActiveCfg = Debug|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.Build.0 = Debug|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.ActiveCfg = Debug|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.Build.0 = Debug|x64 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.ActiveCfg = Release|Win32 {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.Build.0 = Release|Win32 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.ActiveCfg = Release|x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/dec/decConsole.vcproj b/codec/build/win32/dec/decConsole.vcproj index 9c101589..afa42bb1 100644 --- a/codec/build/win32/dec/decConsole.vcproj +++ b/codec/build/win32/dec/decConsole.vcproj @@ -4,12 +4,16 @@ Version="9.00" Name="decConsole" ProjectGUID="{71973A8E-103D-4FB7-951F-55E35E7F60FA}" + RootNamespace="decConsole" TargetFrameworkVersion="0" > + @@ -105,6 +109,98 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,6 +410,15 @@ PreprocessorDefinitions="" /> + + + @@ -230,6 +428,15 @@ PreprocessorDefinitions="" /> + + + + + + @@ -256,6 +472,15 @@ PreprocessorDefinitions="" /> + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA} @@ -19,11 +27,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -31,27 +49,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release .\..\..\..\obj\decConsole\Release\ + .\..\..\..\obj\decConsole\Release\ false + false .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win32\Debug .\..\..\..\obj\decConsole\Debug\ + .\..\..\..\obj\decConsole\Debug\ true + true AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + decConsole + decConsole decConsole + decConsole @@ -95,6 +135,47 @@ $(OutDir)\decConsole.bsc + + + .\..\..\..\..\bin\Release/decConsole.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decConsole\Release/decConsole.pch + .\..\..\..\obj\decConsole\Release/ + .\..\..\..\obj\decConsole\Release/ + .\..\..\..\obj\decConsole\Release/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0804 + + + $(OutDir)\decConsole.exe + true + ..\..\..\..\bin;%(AdditionalLibraryDirectories) + $(OutDir)\decConsole.pdb + false + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Release\welsdec.lib;%(AdditionalDependencies) + + + true + $(OutDir)\decConsole.bsc + + .\..\..\..\..\bin\Debug/decConsole.tlb @@ -138,19 +219,68 @@ $(OutDir)\decConsole.bsc + + + .\..\..\..\..\bin\Debug/decConsole.tlb + + + + + Disabled + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decConsole\Debug/decConsole.pch + .\..\..\..\obj\decConsole\Debug/ + .\..\..\..\obj\decConsole\Debug/ + .\..\..\..\obj\decConsole\Debug/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0804 + + + $(OutDir)\decConsole.exe + true + ..\..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\decConsoled.pdb + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\debug\welsdec.lib;%(AdditionalDependencies) + + + true + $(OutDir)\decConsole.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/codec/build/win32/dec/decConsole_2010.vcxproj.filters b/codec/build/win32/dec/decConsole_2010.vcxproj.filters new file mode 100644 index 00000000..f4b34ad2 --- /dev/null +++ b/codec/build/win32/dec/decConsole_2010.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + + + + + + {0c938d62-d5b4-4fa0-b36f-6dd328b07d8d} + + + {bdcdcf1c-d440-47f3-beea-a002e1244565} + + + \ No newline at end of file diff --git a/codec/build/win32/dec/decConsole_2012.vcxproj b/codec/build/win32/dec/decConsole_2012.vcxproj index 6693a86b..7d5b4f5b 100644 --- a/codec/build/win32/dec/decConsole_2012.vcxproj +++ b/codec/build/win32/dec/decConsole_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {71973A8E-103D-4FB7-951F-55E35E7F60FA} @@ -20,12 +28,24 @@ false MultiByte + + Application + v110 + false + MultiByte + Application v110 false MultiByte + + Application + v110 + false + MultiByte + @@ -33,10 +53,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -47,12 +75,24 @@ false decConsole + + false + decConsole + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decConsole\Release\ + .\..\..\..\..\bin\win32\Debug .\..\..\..\obj\decConsole\Debug\ true decConsole + + true + decConsole + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\decConsole\Debug\ + .\..\..\..\..\bin\Release/decConsole.tlb @@ -95,6 +135,48 @@ $(OutDir)\decConsole.bsc + + + .\..\..\..\..\bin\Release/decConsole.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decConsole\Release/decConsole.pch + .\..\..\..\obj\decConsole\Release/ + .\..\..\..\obj\decConsole\Release/ + .\..\..\..\obj\decConsole\Release/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0804 + + + $(OutDir)\decConsole.exe + true + ..\..\..\..\bin;%(AdditionalLibraryDirectories) + $(OutDir)\decConsole.pdb + false + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) + $(OutDir)\decConsole.pgd + + + true + $(OutDir)\decConsole.bsc + + .\..\..\..\..\bin\Debug/decConsole.tlb @@ -139,6 +221,49 @@ $(OutDir)\decConsole.bsc + + + .\..\..\..\..\bin\Debug/decConsole.tlb + + + + + Disabled + ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\decConsole\Debug/decConsole.pch + .\..\..\..\obj\decConsole\Debug/ + .\..\..\..\obj\decConsole\Debug/ + .\..\..\..\obj\decConsole\Debug/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0804 + + + $(OutDir)\decConsole.exe + true + ..\..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\decConsole.pdb + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) + $(OutDir)\decConsole.map + $(OutDir)\decConsole.pgd + + + true + $(OutDir)\decConsole.bsc + + diff --git a/codec/build/win32/dec/decConsole_2012.vcxproj.filters b/codec/build/win32/dec/decConsole_2012.vcxproj.filters new file mode 100644 index 00000000..4a703a87 --- /dev/null +++ b/codec/build/win32/dec/decConsole_2012.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + + + + + + {405243de-3db2-4e0f-9729-6ab7f6e86fc8} + + + {fc20d6a2-8276-4f03-9519-8340502918b3} + + + \ No newline at end of file diff --git a/codec/build/win32/enc/WelsEncCore.vcproj b/codec/build/win32/enc/WelsEncCore.vcproj index d41ad3fc..153619fd 100644 --- a/codec/build/win32/enc/WelsEncCore.vcproj +++ b/codec/build/win32/enc/WelsEncCore.vcproj @@ -11,6 +11,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,6 +376,24 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {59208004-1774-4816-AC24-31FF44C324B4} @@ -20,11 +28,21 @@ false MultiByte + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + @@ -33,25 +51,45 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Debug\ + .\..\..\..\..\bin\win64\Debug\ .\..\..\..\obj\encoder\core\Debug\ + .\..\..\..\obj\encoder\core\Debug\ .\..\..\..\..\bin\win32\Release\ + .\..\..\..\..\bin\win64\Release\ .\..\..\..\obj\encoder\core\Release\ + .\..\..\..\obj\encoder\core\Release\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + welsecore + welsecore welsecore + welsecore @@ -85,6 +123,37 @@ IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + + Disabled + ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encoder\core\Debug/WelsEncCore.pch + .\..\..\..\obj\encoder\core\Debug/ + .\..\..\..\obj\encoder\core\Debug/ + .\..\..\..\obj\encoder\core\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\..\..\libs\welsecore.lib + true + + + true + .\..\..\..\..\..\bin\Debug/WelsEncCore.bsc + + + IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + Full @@ -121,171 +190,315 @@ IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + + Full + AnySuitable + Speed + true + ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encoder\core\Release/WelsEncCore.pch + .\..\..\..\obj\encoder\core\Release/ + .\..\..\..\obj\encoder\core\Release/ + .\..\..\..\obj\encoder\core\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /LTCG %(AdditionalOptions) + ..\..\..\..\libs\welsecore.lib + true + + + true + .\..\..\..\..\..\bin\Release/WelsEncCore.bsc + + + IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) OUPUT_REF_PIC;%(PreprocessorDefinitions) + OUPUT_REF_PIC;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -354,128 +567,253 @@ nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/codec/build/win32/enc/WelsEncCore_2010.vcxproj.filters b/codec/build/win32/enc/WelsEncCore_2010.vcxproj.filters new file mode 100644 index 00000000..6cbc3951 --- /dev/null +++ b/codec/build/win32/enc/WelsEncCore_2010.vcxproj.filters @@ -0,0 +1,341 @@ + + + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {e1ed79db-b914-4095-9d49-249820326ca3} + + + {3a8adde3-f7c9-4379-b129-b78fe9572a14} + + + {a61659e3-bcfd-4bf8-8f1a-f9017417d6e5} + + + \ No newline at end of file diff --git a/codec/build/win32/enc/WelsEncCore_2012.vcxproj b/codec/build/win32/enc/WelsEncCore_2012.vcxproj index 57fce9e8..cf008926 100644 --- a/codec/build/win32/enc/WelsEncCore_2012.vcxproj +++ b/codec/build/win32/enc/WelsEncCore_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {59208004-1774-4816-AC24-31FF44C324B4} @@ -21,12 +29,24 @@ false MultiByte + + StaticLibrary + v110 + false + MultiByte + StaticLibrary v110 false MultiByte + + StaticLibrary + v110 + false + MultiByte + @@ -35,10 +55,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -48,11 +76,21 @@ .\..\..\..\obj\encoder\core\Debug\ welsecore + + welsecore + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\encoder\core\Debug\ + .\..\..\..\..\bin\win32\Release .\..\..\..\obj\encoder\core\Release\ welsecore + + welsecore + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\encoder\core\Release\ + Disabled @@ -85,6 +123,37 @@ IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + + Disabled + ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encoder\core\Debug/WelsEncCore.pch + .\..\..\..\obj\encoder\core\Debug/ + .\..\..\..\obj\encoder\core\Debug/ + .\..\..\..\obj\encoder\core\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsecore.lib + true + + + true + $(OutDir)\welsecore.bsc + + + IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + Full @@ -121,6 +190,42 @@ IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + + Full + AnySuitable + Speed + true + ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encoder\core\Release/WelsEncCore.pch + .\..\..\..\obj\encoder\core\Release/ + .\..\..\..\obj\encoder\core\Release/ + .\..\..\..\obj\encoder\core\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /LTCG %(AdditionalOptions) + $(OutDir)\welsecore.lib + true + + + true + $(OutDir)\welsecore.bsc + + + IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ + + @@ -129,6 +234,7 @@ OUPUT_REF_PIC;%(PreprocessorDefinitions) + OUPUT_REF_PIC;%(PreprocessorDefinitions) @@ -221,128 +327,253 @@ nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/codec/build/win32/enc/WelsEncCore_2012.vcxproj.filters b/codec/build/win32/enc/WelsEncCore_2012.vcxproj.filters new file mode 100644 index 00000000..82ac2025 --- /dev/null +++ b/codec/build/win32/enc/WelsEncCore_2012.vcxproj.filters @@ -0,0 +1,341 @@ + + + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {13c71e64-b5b9-4079-a9ae-5845ec3fa788} + + + {e7a19d99-bcd0-4bce-8701-300e8faceaf9} + + + {0c7ff5a9-f50f-4e82-a8b8-a6d09fdf8fc3} + + + \ No newline at end of file diff --git a/codec/build/win32/enc/WelsEncPlus.vcproj b/codec/build/win32/enc/WelsEncPlus.vcproj index 688b23b1..f141fd8c 100644 --- a/codec/build/win32/enc/WelsEncPlus.vcproj +++ b/codec/build/win32/enc/WelsEncPlus.vcproj @@ -11,6 +11,9 @@ + @@ -219,6 +222,210 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -248,6 +455,24 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codec/build/win32/enc/WelsEncPlus_2010.vcxproj b/codec/build/win32/enc/WelsEncPlus_2010.vcxproj index 2797bb06..e57955dc 100644 --- a/codec/build/win32/enc/WelsEncPlus_2010.vcxproj +++ b/codec/build/win32/enc/WelsEncPlus_2010.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F} @@ -20,11 +28,21 @@ false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + @@ -32,27 +50,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug .\..\..\..\obj\encoder\plus\Debug\ + .\..\..\..\obj\encoder\plus\Debug\ true + true .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release .\..\..\..\obj\encoder\plus\Release\ + .\..\..\..\obj\encoder\plus\Release\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + welsenc + welsenc welsenc + welsenc @@ -101,6 +141,50 @@ .\..\..\..\..\..\bin\Debug/WelsEncPlus.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Debug/WelsEncPlus.tlb + + + + + Disabled + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encoder\plus\Debug/WelsEncPlus.pch + .\..\..\..\obj\encoder\plus\Debug/ + .\..\..\..\obj\encoder\plus\Debug/ + .\..\..\..\obj\encoder\plus\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + welsecore.lib;%(AdditionalDependencies) + $(OutDir)\welsenc.dll + true + ..\..\..\..\libs;%(AdditionalLibraryDirectories) + ..\..\..\encoder\plus\src\wels_enc_export.def + true + $(OutDir)\welsenc.pdb + false + true + $(OutDir)\welsenc.lib + + + true + .\..\..\..\..\..\bin\Debug/WelsEncPlus.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -156,12 +240,69 @@ .\..\..\..\..\..\bin\Release/WelsEncPlus.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Release/WelsEncPlus.tlb + + + + + Full + AnySuitable + Speed + true + true + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encoder\plus\Release/WelsEncPlus.pch + .\..\..\..\obj\encoder\plus\Release/ + .\..\..\..\obj\encoder\plus\Release/ + .\..\..\..\obj\encoder\plus\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MAPINFO:exports /LTCG %(AdditionalOptions) + welsecore.lib;%(AdditionalDependencies) + $(OutDir)\welsenc.dll + true + ..\..\..\..\libs;%(AdditionalLibraryDirectories) + ..\..\..\encoder\plus\src\wels_enc_export.def + true + $(OutDir)\welsenc.pdb + true + $(OutDir)\welsenc.map + true + false + true + $(OutDir)\welsenc.lib + + + true + .\..\..\..\..\..\bin\Release/WelsEncPlus.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -177,9 +318,13 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) + \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) + \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) diff --git a/codec/build/win32/enc/WelsEncPlus_2010.vcxproj.filters b/codec/build/win32/enc/WelsEncPlus_2010.vcxproj.filters new file mode 100644 index 00000000..f1f3ce71 --- /dev/null +++ b/codec/build/win32/enc/WelsEncPlus_2010.vcxproj.filters @@ -0,0 +1,46 @@ + + + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + + + {b7253eff-2d3b-493f-a21c-bbaa545262d3} + + + {c0231c06-b7cc-4cf4-a988-c0cb5e1a901e} + + + {9d828e9e-6828-4009-8a5f-b3116d365a52} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj index d7ad4471..429d8ccd 100644 --- a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj +++ b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F} @@ -21,12 +29,24 @@ false MultiByte + + DynamicLibrary + v110 + false + MultiByte + DynamicLibrary v110 false MultiByte + + DynamicLibrary + v110 + false + MultiByte + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -48,12 +76,24 @@ true welsenc + + true + welsenc + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\encoder\plus\Debug\ + .\..\..\..\..\bin\win32\Release .\..\..\..\obj\encoder\plus\Release\ false welsenc + + false + welsenc + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\encoder\plus\Release\ + _DEBUG;%(PreprocessorDefinitions) @@ -101,6 +141,51 @@ $(OutDir)\welsenc.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Debug/WelsEncPlus.tlb + + + + + Disabled + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encoder\plus\Debug/WelsEncPlus.pch + .\..\..\..\obj\encoder\plus\Debug/ + .\..\..\..\obj\encoder\plus\Debug/ + .\..\..\..\obj\encoder\plus\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsecore.lib;%(AdditionalDependencies) + $(OutDir)\welsenc.dll + true + ..\..\..\..\libs;%(AdditionalLibraryDirectories) + ..\..\..\encoder\plus\src\wels_enc_export.def + true + $(OutDir)\welsenc.pdb + false + true + $(OutDir)\welsenc.lib + $(OutDir)\welsenc.pgd + + + true + $(OutDir)\welsenc.bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -156,6 +241,60 @@ $(OutDir)\welsenc.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\..\..\..\..\..\bin\Release/WelsEncPlus.tlb + + + + + Full + AnySuitable + Speed + true + true + ..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSENCPLUS_EXPORTS;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encoder\plus\Release/WelsEncPlus.pch + .\..\..\..\obj\encoder\plus\Release/ + .\..\..\..\obj\encoder\plus\Release/ + .\..\..\..\obj\encoder\plus\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MAPINFO:exports /LTCG %(AdditionalOptions) + $(OutDir)\welsecore.lib;%(AdditionalDependencies) + $(OutDir)\welsenc.dll + true + ..\..\..\..\libs;%(AdditionalLibraryDirectories) + ..\..\..\encoder\plus\src\wels_enc_export.def + true + $(OutDir)\welsenc.pdb + true + $(OutDir)\welsenc.map + true + false + true + $(OutDir)\welsenc.lib + $(OutDir)\welsenc.pgd + + + true + $(OutDir)\welsenc.bsc + + @@ -172,7 +311,9 @@ \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) + \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) + \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) diff --git a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj.filters b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj.filters new file mode 100644 index 00000000..3b39e5db --- /dev/null +++ b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj.filters @@ -0,0 +1,46 @@ + + + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + + + {c8d1576c-9972-4a22-a03e-73ebf2c26cf0} + + + {1c270d31-a6f8-402a-a114-07b60fc1bae3} + + + {a7c514f0-79d6-4b1b-9334-a936b3057332} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/codec/build/win32/enc/WelsEncoder_2008.sln b/codec/build/win32/enc/WelsEncoder_2008.sln index 3dbffaed..b54be720 100644 --- a/codec/build/win32/enc/WelsEncoder_2008.sln +++ b/codec/build/win32/enc/WelsEncoder_2008.sln @@ -22,25 +22,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.ActiveCfg = Debug|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.Build.0 = Debug|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.ActiveCfg = Debug|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.Build.0 = Debug|x64 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.ActiveCfg = Release|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.Build.0 = Release|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.ActiveCfg = Release|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.Build.0 = Release|x64 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.ActiveCfg = Debug|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.Build.0 = Debug|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.ActiveCfg = Debug|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.Build.0 = Debug|x64 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.ActiveCfg = Release|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.Build.0 = Release|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.ActiveCfg = Release|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.Build.0 = Release|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.ActiveCfg = Debug|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.Build.0 = Debug|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.ActiveCfg = Debug|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.Build.0 = Debug|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.ActiveCfg = Release|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.Build.0 = Release|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.ActiveCfg = Release|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.Build.0 = Release|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.ActiveCfg = Debug|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.Build.0 = Debug|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.ActiveCfg = Release|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/enc/WelsEncoder_2010.sln b/codec/build/win32/enc/WelsEncoder_2010.sln index f592c230..97b17a44 100644 --- a/codec/build/win32/enc/WelsEncoder_2010.sln +++ b/codec/build/win32/enc/WelsEncoder_2010.sln @@ -15,25 +15,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.ActiveCfg = Debug|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.Build.0 = Debug|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.ActiveCfg = Debug|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.Build.0 = Debug|x64 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.ActiveCfg = Release|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.Build.0 = Release|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.ActiveCfg = Release|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.Build.0 = Release|x64 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.ActiveCfg = Debug|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.Build.0 = Debug|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.ActiveCfg = Debug|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.Build.0 = Debug|x64 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.ActiveCfg = Release|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.Build.0 = Release|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.ActiveCfg = Release|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.Build.0 = Release|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.ActiveCfg = Debug|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.Build.0 = Debug|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.ActiveCfg = Debug|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.Build.0 = Debug|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.ActiveCfg = Release|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.Build.0 = Release|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.ActiveCfg = Release|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.Build.0 = Release|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.ActiveCfg = Debug|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.Build.0 = Debug|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.ActiveCfg = Release|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/enc/WelsEncoder_2012.sln b/codec/build/win32/enc/WelsEncoder_2012.sln index f4c4e315..48cdcfe9 100644 --- a/codec/build/win32/enc/WelsEncoder_2012.sln +++ b/codec/build/win32/enc/WelsEncoder_2012.sln @@ -18,25 +18,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.ActiveCfg = Debug|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.Build.0 = Debug|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.ActiveCfg = Debug|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.Build.0 = Debug|x64 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.ActiveCfg = Release|Win32 {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.Build.0 = Release|Win32 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.ActiveCfg = Release|x64 + {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.Build.0 = Release|x64 {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.ActiveCfg = Debug|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.Build.0 = Debug|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.ActiveCfg = Debug|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.Build.0 = Debug|x64 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.ActiveCfg = Release|Win32 {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.Build.0 = Release|Win32 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.ActiveCfg = Release|x64 + {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.Build.0 = Release|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.ActiveCfg = Debug|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.Build.0 = Debug|x64 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32 {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.ActiveCfg = Release|x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.Build.0 = Release|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.ActiveCfg = Debug|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.Build.0 = Debug|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.ActiveCfg = Debug|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.Build.0 = Debug|x64 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.ActiveCfg = Release|Win32 {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.Build.0 = Release|Win32 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.ActiveCfg = Release|x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/enc/encConsole.vcproj b/codec/build/win32/enc/encConsole.vcproj index 1aacf591..fd7f43de 100644 --- a/codec/build/win32/enc/encConsole.vcproj +++ b/codec/build/win32/enc/encConsole.vcproj @@ -11,6 +11,9 @@ + @@ -205,6 +208,198 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -238,6 +433,24 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459} @@ -20,11 +28,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -32,27 +50,49 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug .\..\..\..\obj\encConsole\Debug\ + .\..\..\..\obj\encConsole\Debug\ true + true .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release .\..\..\..\obj\encConsole\Release\ + .\..\..\..\obj\encConsole\Release\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + encConsole + encConsole encConsole + encConsole @@ -96,6 +136,46 @@ .\..\..\..\..\..\bin\Debug/encConsole.bsc + + + .\..\..\..\..\..\bin\Debug/encConsole.tlb + + + + + Disabled + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;ENCODER_CORE;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encConsole\Debug/encConsole.pch + .\..\..\..\obj\encConsole\Debug/ + .\..\..\..\obj\encConsole\Debug/ + .\..\..\..\obj\encConsole\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\encConsole.exe + true + ..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\encConsole.pdb + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Debug\welsenc.lib;%(AdditionalDependencies) + + + true + .\..\..\..\..\..\bin\Debug/encConsole.bsc + + .\..\..\..\..\..\bin\Release/encConsole.tlb @@ -142,18 +222,71 @@ .\..\..\..\..\..\bin\Release/encConsole.bsc + + + .\..\..\..\..\..\bin\Release/encConsole.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_CONSOLE;ENCODER_CORE;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encConsole\Release/encConsole.pch + .\..\..\..\obj\encConsole\Release/ + .\..\..\..\obj\encConsole\Release/ + .\..\..\..\obj\encConsole\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /LTCG %(AdditionalOptions) + $(OutDir)\encConsole.exe + true + ..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\encConsole.pdb + false + false + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Release\welsenc.lib;%(AdditionalDependencies) + + + true + .\..\..\..\..\..\bin\Release/encConsole.bsc + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/codec/build/win32/enc/encConsole_2010.vcxproj.filters b/codec/build/win32/enc/encConsole_2010.vcxproj.filters new file mode 100644 index 00000000..4c885523 --- /dev/null +++ b/codec/build/win32/enc/encConsole_2010.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + sources + + + sources + + + sources + + + + + {042c3183-beb3-4f0d-bd6e-0d2be2b216bb} + + + {db2e91a6-cd6e-4567-89a6-89475e170fe4} + + + + + headers + + + \ No newline at end of file diff --git a/codec/build/win32/enc/encConsole_2012.vcxproj b/codec/build/win32/enc/encConsole_2012.vcxproj index 108b59b1..bdc8ca89 100644 --- a/codec/build/win32/enc/encConsole_2012.vcxproj +++ b/codec/build/win32/enc/encConsole_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {8509E2A8-2CBD-49E2-B564-3EFF1E927459} @@ -21,12 +29,24 @@ false MultiByte + + Application + v110 + false + MultiByte + Application v110 false MultiByte + + Application + v110 + false + MultiByte + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -48,12 +76,24 @@ true encConsole + + true + encConsole + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\encConsole\Debug + .\..\..\..\..\bin\win32\Release .\..\..\..\obj\encConsole\Release false encConsole + + false + encConsole + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\encConsole\Release + .\..\..\..\..\..\bin\Debug/encConsole.tlb @@ -97,6 +137,48 @@ $(OutDir)\encConsole.bsc + + + .\..\..\..\..\..\bin\Debug/encConsole.tlb + + + + + Disabled + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_CONSOLE;ENCODER_CORE;MT_ENABLED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + .\..\..\..\obj\encConsole\Debug/encConsole.pch + .\..\..\..\obj\encConsole\Debug/ + .\..\..\..\obj\encConsole\Debug/ + .\..\..\..\obj\encConsole\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\encConsole.exe + true + ..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\encConsole.pdb + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) + $(OutDir)\encConsole.map + $(OutDir)\encConsole.pgd + + + true + $(OutDir)\encConsole.bsc + + .\..\..\..\..\..\bin\Release/encConsole.tlb @@ -144,6 +226,53 @@ $(OutDir)\encConsole.bsc + + + .\..\..\..\..\..\bin\Release/encConsole.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\console\enc\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;..\..\..\encoder\core\inc;..\..\..\common;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_CONSOLE;ENCODER_CORE;MT_ENABLED;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\encConsole\Release/encConsole.pch + .\..\..\..\obj\encConsole\Release/ + .\..\..\..\obj\encConsole\Release/ + .\..\..\..\obj\encConsole\Release/ + Level3 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /LTCG %(AdditionalOptions) + $(OutDir)\encConsole.exe + true + ..\..\..\bin;%(AdditionalLibraryDirectories) + true + $(OutDir)\encConsole.pdb + true + false + Console + false + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) + $(OutDir)\encConsole.map + $(OutDir)\encConsole.pgd + + + true + $(OutDir)\encConsole.bsc + + diff --git a/codec/build/win32/enc/encConsole_2012.vcxproj.filters b/codec/build/win32/enc/encConsole_2012.vcxproj.filters new file mode 100644 index 00000000..abbf3ceb --- /dev/null +++ b/codec/build/win32/enc/encConsole_2012.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + sources + + + sources + + + sources + + + + + {0c014740-01ca-442c-b5aa-50670ac5f6a7} + + + {e1c2cb97-ea2f-4d12-acc5-738627f45aa0} + + + + + headers + + + \ No newline at end of file diff --git a/codec/console/dec/src/h264dec.cpp b/codec/console/dec/src/h264dec.cpp index b411c045..0bd6ba2f 100644 --- a/codec/console/dec/src/h264dec.cpp +++ b/codec/console/dec/src/h264dec.cpp @@ -31,7 +31,7 @@ * h264dec.cpp: Wels Decoder Console Implementation file */ -#if defined (WIN32) +#if defined (_WIN32) #include #include #else diff --git a/codec/console/dec/src/read_config.cpp b/codec/console/dec/src/read_config.cpp index fffda0fb..ab078bcd 100644 --- a/codec/console/dec/src/read_config.cpp +++ b/codec/console/dec/src/read_config.cpp @@ -37,7 +37,7 @@ * 08/18/2008 Created * *****************************************************************************/ -#if !defined(WIN32) +#if !defined(_WIN32) #include #include #endif diff --git a/codec/console/enc/src/welsenc.cpp b/codec/console/enc/src/welsenc.cpp index 36e31a30..2e3b8758 100644 --- a/codec/console/enc/src/welsenc.cpp +++ b/codec/console/enc/src/welsenc.cpp @@ -451,11 +451,11 @@ int ParseCommandLine (int argc, char** argv, SVCEncodingParam& sParam) { void PrintHelp() { printf ("\n Wels SVC Encoder Usage:\n\n"); + printf (" Syntax: welsenc.exe -h\n"); printf (" Syntax: welsenc.exe welsenc.cfg\n"); printf (" Syntax: welsenc.exe welsenc.cfg [options]\n"); printf ("\n Supported Options:\n"); - printf (" -h Print Help\n"); printf (" -bf Bit Stream File\n"); printf (" -frms Number of total frames to be encoded\n"); printf (" -gop GOPSize - GOP size (2,4,8,16,32,64, default: 1)\n"); @@ -497,76 +497,72 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi while (n < argc) { pCommand = argv[n++]; - if (! (strcmp (pCommand, "-h"))) { // confirmed_safe_unsafe_usage - PrintHelp(); - continue; - } - if (! (strcmp (pCommand, "-bf"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-bf")) { // confirmed_safe_unsafe_usage sFileSet.strBsFile.assign (argv[n]); ++ n; continue; } - if (! (strcmp (pCommand, "-frms"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-frms")) { // confirmed_safe_unsafe_usage pSvcParam.uiFrameToBeCoded = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-gop"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-gop")) { // confirmed_safe_unsafe_usage pSvcParam.uiGopSize = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-iper"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-iper")) { // confirmed_safe_unsafe_usage pSvcParam.uiIntraPeriod = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-spsid"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-spsid")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableSpsPpsIdAddition = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-denois"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-denois")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableDenoise = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-scene"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-scene")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableSceneChangeDetect = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-bgd"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-bgd")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableBackgroundDetection = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-aq"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-aq")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableAdaptiveQuant = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-ltr"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-ltr")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableLongTermReference = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-ltrper"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-ltrper")) { // confirmed_safe_unsafe_usage pSvcParam.uiLtrMarkPeriod = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-rc"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-rc")) { // confirmed_safe_unsafe_usage pSvcParam.bEnableRc = atoi (argv[n ]) ? true : false; ++ n; continue; } - if (! (strcmp (pCommand, "-tarb"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-tarb")) { // confirmed_safe_unsafe_usage pSvcParam.iTargetBitrate = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-numl"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-numl")) { // confirmed_safe_unsafe_usage bool_t bFound = false; pSvcParam.iNumDependencyLayer = atoi (argv[n++]); for (int ln = 0 ; ln < pSvcParam.iNumDependencyLayer ; ln++) { @@ -669,13 +665,13 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi //n += 1; continue; } - if (! (strcmp (pCommand, "-org"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-org")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); sFileSet.sSpatialLayers[iLayer].strSeqFile.assign (argv[n]); ++ n; continue; } - if (! (strcmp (pCommand, "-drec"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-drec")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); const int iLen = strlen (argv[n]); // confirmed_safe_unsafe_usage #ifdef ENABLE_FRAME_DUMP @@ -686,7 +682,7 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi ++ n; continue; } - if (! (strcmp (pCommand, "-sw"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-sw")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->iFrameWidth = atoi (argv[n ]); @@ -694,7 +690,7 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi ++ n; continue; } - if (! (strcmp (pCommand, "-sh"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-sh")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->iFrameHeight = atoi (argv[n ]); @@ -702,14 +698,14 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi ++ n; continue; } - if (! (strcmp (pCommand, "-frin"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-frin")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->fInputFrameRate = (float)atof (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-frout"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-frout")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->fOutputFrameRate = (float)atof (argv[n ]); @@ -717,7 +713,7 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi continue; } - if (! (strcmp (pCommand, "-lqp"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-lqp")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; uiQpChangeFlag[iLayer] = 1; @@ -727,7 +723,7 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi } //sLayerCtx[iLayer].num_quality_layers = pDLayer->num_quality_layers = 1; - if (! (strcmp (pCommand, "-ltarb"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-ltarb")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->iSpatialBitrate = 1000 * atoi (argv[n ]); @@ -735,7 +731,7 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi continue; } - if (! (strcmp (pCommand, "-slcmd"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-slcmd")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; @@ -762,14 +758,14 @@ int ParseCommandLine (int argc, char** argv, SWelsSvcCodingParam& pSvcParam, SFi ++ n; continue; } - if (! (strcmp (pCommand, "-slcsize"))) { //confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-slcsize")) { //confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->sMso.sSliceArgument.uiSliceSizeConstraint = atoi (argv[n ]); ++ n; continue; } - if (! (strcmp (pCommand, "-slcnum"))) { // confirmed_safe_unsafe_usage + if (!strcmp (pCommand, "-slcnum")) { // confirmed_safe_unsafe_usage unsigned int iLayer = atoi (argv[n++]); SDLayerParam* pDLayer = &pSvcParam.sDependencyLayers[iLayer]; pDLayer->sMso.sSliceArgument.iSliceNum = atoi (argv[n ]); @@ -1035,7 +1031,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) { int8_t iDlayerIdx = 0; uint8_t* pYUV[MAX_DEPENDENCY_LAYER] = { 0 }; SSourcePicture** pSrcPicList = NULL; -#if (defined(RUN_SIMULATOR) || defined(WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) +#if (defined(RUN_SIMULATOR) || defined(_WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) // Inactive with sink with output file handler FILE* pFpBs = NULL; #endif @@ -1095,7 +1091,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) { iRet = 1; goto INSIDE_MEM_FREE; } -#if (defined(RUN_SIMULATOR) || defined(WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) +#if (defined(RUN_SIMULATOR) || defined(_WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) // Inactive with sink with output file handler if (fs.strBsFile.length() > 0) { pFpBs = fopen (fs.strBsFile.c_str(), "wb"); @@ -1259,7 +1255,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) { delete [] pUCArry; } #endif -#if (defined(RUN_SIMULATOR) || defined(WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) +#if (defined(RUN_SIMULATOR) || defined(_WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) fwrite (pLayerBsInfo->pBsBuf, 1, iLayerSize, pFpBs); // write pure bit stream into file #endif iFrameSize += iLayerSize; @@ -1287,7 +1283,7 @@ int ProcessEncodingSvcWithConfig (ISVCEncoder* pPtrEnc, int argc, char** argv) { } INSIDE_MEM_FREE: { -#if (defined(RUN_SIMULATOR) || defined(WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) +#if (defined(RUN_SIMULATOR) || defined(_WIN32)||defined(_MACH_PLATFORM) || (defined(__GNUC__))) if (pFpBs) { fclose (pFpBs); pFpBs = NULL; @@ -1339,7 +1335,7 @@ INSIDE_MEM_FREE: { // Merge from Heifei's Wonder. Lock process to a single core void LockToSingleCore() { -#ifdef _MSC_VER +#if defined(WIN32) && !defined(WIN64) //for 2005 compiler, change "DWORD" to "DWORD_PTR" DWORD ProcessAffMask = 0, SystemAffMask = 0; HANDLE hProcess = GetCurrentProcess(); @@ -1373,7 +1369,7 @@ long CreateSVCEncHandle (ISVCEncoder** ppEncoder) { return ret; } -void DestroySVCEncHanlde (ISVCEncoder* pEncoder) { +void DestroySVCEncHandle (ISVCEncoder* pEncoder) { if (pEncoder) { #if defined(MACOS) WelsEncBundleDestroyEncoder (pEncoder); @@ -1420,14 +1416,15 @@ int main (int argc, char** argv) } else { string strCfgFileName = argv[1]; basic_string ::size_type index; - static const basic_string ::size_type npos = size_t (-1); index = strCfgFileName.rfind (".cfg"); // check configuration type (like .cfg?) - if (index == npos) { + if (index == std::string::npos) { if (argc > 2) { iRet = ProcessEncodingSvcWithParam (pSVCEncoder, argc, argv); if (iRet != 0) goto exit; - } else { + } else if (argc == 2 && ! strcmp(argv[1], "-h")) + PrintHelp(); + else { cout << "You specified pCommand is invalid!!" << endl; goto exit; } @@ -1438,11 +1435,11 @@ int main (int argc, char** argv) } } - DestroySVCEncHanlde (pSVCEncoder); + DestroySVCEncHandle (pSVCEncoder); return 0; exit: - DestroySVCEncHanlde (pSVCEncoder); + DestroySVCEncHandle (pSVCEncoder); PrintHelp(); return 1; } diff --git a/codec/decoder/core/inc/crt_util_safe_x.h b/codec/decoder/core/inc/crt_util_safe_x.h index b19c6ee7..4805e8a4 100644 --- a/codec/decoder/core/inc/crt_util_safe_x.h +++ b/codec/decoder/core/inc/crt_util_safe_x.h @@ -47,7 +47,7 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #include #include @@ -55,7 +55,7 @@ #include #include #include "typedefs.h" -#endif//WIN32 +#endif//_WIN32 #include "typedefs.h" @@ -71,7 +71,7 @@ extern "C" { typedef FILE WelsFileHandle; -#ifdef WIN32 +#ifdef _WIN32 typedef struct _timeb SWelsTime; #else typedef struct timeb SWelsTime; diff --git a/codec/decoder/core/inc/macros.h b/codec/decoder/core/inc/macros.h index 7fed305a..17fbef17 100644 --- a/codec/decoder/core/inc/macros.h +++ b/codec/decoder/core/inc/macros.h @@ -57,14 +57,14 @@ namespace WelsDec { */ #define FORCE_STACK_ALIGN_1D(_tp, _nm, _sz, _al) \ _tp _nm ## _tEmP[(_sz)+(_al)-1]; \ - _tp *_nm = _nm ## _tEmP + ((_al)-1) - (((int32_t)(_nm ## _tEmP + ((_al)-1)) & ((_al)-1))/sizeof(_tp)) + _tp *_nm = _nm ## _tEmP + ((_al)-1) - (((uintptr_t)(_nm ## _tEmP + ((_al)-1)) & ((_al)-1))/sizeof(_tp)) #define ENFORCE_STACK_ALIGN_2D(_tp, _nm, _cx, _cy, _al) \ assert( ((_al) && !((_al) & ((_al) - 1))) && ((_al) >= sizeof(_tp)) ); /*_al should be power-of-2 and >= sizeof(_tp)*/\ _tp _nm ## _tEmP[(_cx)*(_cy)+(_al)/sizeof(_tp)-1]; \ _tp *_nm ## _tEmP_al = _nm ## _tEmP + ((_al)/sizeof(_tp)-1); \ - _nm ## _tEmP_al -= (((int32_t)_nm ## _tEmP_al & ((_al)-1))/sizeof(_tp)); \ + _nm ## _tEmP_al -= (((uintptr_t)_nm ## _tEmP_al & ((_al)-1))/sizeof(_tp)); \ _tp (*_nm)[(_cy)] = (_tp (*)[(_cy)])_nm ## _tEmP_al; diff --git a/codec/decoder/core/inc/measure_time.h b/codec/decoder/core/inc/measure_time.h index 71f6145e..4542d425 100644 --- a/codec/decoder/core/inc/measure_time.h +++ b/codec/decoder/core/inc/measure_time.h @@ -50,9 +50,9 @@ #include #endif #include -#if defined(WIN32) +#if defined(_WIN32) #include -#endif//#if WIN32 +#endif//#if _WIN32 #ifdef __cplusplus extern "C" { @@ -71,7 +71,7 @@ int64_t WelsTime (void_t) { gettimeofday (&tv_date, NULL); return ((int64_t) tv_date.tv_sec * 1000000 + (int64_t) tv_date.tv_usec); #else -#if defined (WIN32) +#if defined (_WIN32) static int64_t iMtimeFreq = 0; int64_t iMtimeCur = 0; int64_t iResult = 0; @@ -88,7 +88,7 @@ int64_t WelsTime (void_t) { _ftime (&sTime); return ((int64_t)sTime.time * (1000) + (int64_t)sTime.millitm) * (1000); -#endif//#if WIN32 +#endif//#if _WIN32 #endif//!(defined(_MSC_VER) || defined(__MINGW32__)) } diff --git a/codec/decoder/core/src/au_parser.cpp b/codec/decoder/core/src/au_parser.cpp index 1d608c77..4f83791c 100644 --- a/codec/decoder/core/src/au_parser.cpp +++ b/codec/decoder/core/src/au_parser.cpp @@ -86,7 +86,7 @@ uint8_t* DetectStartCodePrefix (const uint8_t* kpBuf, int32_t* pOffset, int32_t ++ pBits; if ((iIdx >= 3) && ((* (pBits - 1)) == 0x1)) { - *pOffset = ((uint32_t)pBits) - ((uint32_t)kpBuf); + *pOffset = ((uintptr_t)pBits) - ((uintptr_t)kpBuf); return pBits; } @@ -970,4 +970,4 @@ int32_t ResetFmoList (PWelsDecoderContext pCtx) { return iCountNum; } -} // namespace WelsDec \ No newline at end of file +} // namespace WelsDec diff --git a/codec/decoder/core/src/bit_stream.cpp b/codec/decoder/core/src/bit_stream.cpp index ca581e34..7cbed62e 100644 --- a/codec/decoder/core/src/bit_stream.cpp +++ b/codec/decoder/core/src/bit_stream.cpp @@ -48,7 +48,7 @@ inline uint32_t EndianFix (uint32_t uiX) { } #else //WORDS_BIGENDIAN -#ifdef _MSC_VER +#ifdef WIN32 inline uint32_t EndianFix (uint32_t uiX) { __asm { mov eax, uiX diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp index 6c341347..8a9a77b9 100644 --- a/codec/decoder/core/src/decoder_core.cpp +++ b/codec/decoder/core/src/decoder_core.cpp @@ -1555,7 +1555,7 @@ void_t WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) { int32_t CheckBSBound (int32_t iWidth, int32_t iHeight, int32_t sliceNum, int32_t ppsId) { int32_t iRet = 0; -#if defined(WIN32) +#if defined(_WIN32) iRet = ((iWidth == 80) && (iHeight = 45) && (sliceNum < 60)); #elif defined(MACOS) diff --git a/codec/decoder/core/src/mem_align.cpp b/codec/decoder/core/src/mem_align.cpp index e82549d1..006cc9fa 100644 --- a/codec/decoder/core/src/mem_align.cpp +++ b/codec/decoder/core/src/mem_align.cpp @@ -84,7 +84,7 @@ void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { memset (pBuf, 0, kuiSize + kiAlignBytes + kiSizeVoidPtr + kiSizeInt); pAlignBuf = pBuf + kiAlignBytes + kiSizeVoidPtr + kiSizeInt; - pAlignBuf -= (int32_t) pAlignBuf & kiAlignBytes; + pAlignBuf -= (uintptr_t) pAlignBuf & kiAlignBytes; * ((void_t**) (pAlignBuf - kiSizeVoidPtr)) = pBuf; * ((int32_t*) (pAlignBuf - (kiSizeVoidPtr + kiSizeInt))) = kuiSize; diff --git a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp index 03d438e3..0e93352c 100644 --- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp +++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp @@ -708,7 +708,7 @@ static int32_t CavlcGetLevelVal (int32_t iLevel[16], SReadBitsCache* pBitsCache, for (; i < uiTotalCoeff; i++) { if (pBitsCache->uiRemainBits <= 16) SHIFT_BUFFER (pBitsCache); -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN64) uiCache32Bit = pBitsCache->uiCache32Bit; WELS_GET_PREFIX_BITS (uiCache32Bit, iPrefixBits); #else @@ -811,7 +811,7 @@ static int32_t CavlcGetRunBefore (int32_t iRun[16], SReadBitsCache* pBitsCache, iRun[i] = pVlcTable->kpZeroTable[6][uiValue][0]; } else { if (pBitsCache->uiRemainBits < 16) SHIFT_BUFFER (pBitsCache); -#ifdef WIN32 +#if defined(WIN32) && !defined(WIN64) uiCache32Bit = pBitsCache->uiCache32Bit; WELS_GET_PREFIX_BITS (uiCache32Bit, iPrefixBits); #else diff --git a/codec/decoder/core/src/utils.cpp b/codec/decoder/core/src/utils.cpp index f445ee81..34df856c 100644 --- a/codec/decoder/core/src/utils.cpp +++ b/codec/decoder/core/src/utils.cpp @@ -42,7 +42,7 @@ #include #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #include #include @@ -79,7 +79,7 @@ void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...) { } -#if defined(WIN32) +#if defined(_WIN32) #if defined(_MSC_VER) && (_MSC_VER>=1500) diff --git a/codec/decoder/plus/inc/welsCodecTrace.h b/codec/decoder/plus/inc/welsCodecTrace.h index 9d4ad1a4..b4a96409 100644 --- a/codec/decoder/plus/inc/welsCodecTrace.h +++ b/codec/decoder/plus/inc/welsCodecTrace.h @@ -39,7 +39,7 @@ //using namespace WelsDec; namespace WelsDec { -#ifdef WIN32 +#ifdef _WIN32 typedef int (*CM_WELS_TRACE) (const char* kpFormat, ...); #else typedef int (*CM_WELS_TRACE) (const char* kpDllName, const char* kpFormat, ...); @@ -124,7 +124,7 @@ virtual int32_t WriteString (int32_t iLevel, const str_t* pStr); WelsFileHandle* m_pTraceFile; }; -#ifdef WIN32 +#ifdef _WIN32 class CWelsTraceWinDgb : public CWelsTraceBase { public: CWelsTraceWinDgb() {}; diff --git a/codec/decoder/plus/src/welsCodecTrace.cpp b/codec/decoder/plus/src/welsCodecTrace.cpp index 5437d357..ab47e69e 100644 --- a/codec/decoder/plus/src/welsCodecTrace.cpp +++ b/codec/decoder/plus/src/welsCodecTrace.cpp @@ -30,7 +30,7 @@ * */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -180,7 +180,7 @@ int32_t CWelsTraceFile::WriteString (int32_t iLevel, const str_t* pStr) { } -#ifdef WIN32 +#ifdef _WIN32 int32_t CWelsTraceWinDgb::WriteString (int32_t iLevel, const str_t* pStr) { OutputDebugStringA (pStr); @@ -211,7 +211,7 @@ int32_t CWelsCodecTrace::LoadWelsTraceModule() { m_fpWarnTrace = welsStderrTrace; m_fpErrorTrace = welsStderrTrace; #else -#if defined WIN32 +#if defined _WIN32 HMODULE hHandle = ::LoadLibrary ("welstrace.dll"); // HMODULE handle = ::LoadLibrary("contrace.dll"); // for c7 trace if (NULL == hHandle) @@ -293,7 +293,8 @@ int32_t CWelsCodecTrace::LoadWelsTraceModule() { } int32_t CWelsCodecTrace::UnloadWelsTraceModule() { -#if defined WIN32 +#ifndef NO_DYNAMIC_VP +#if defined _WIN32 if (m_hTraceHandle) { ::FreeLibrary ((HMODULE)m_hTraceHandle); } @@ -305,6 +306,7 @@ int32_t CWelsCodecTrace::UnloadWelsTraceModule() { if (m_hTraceHandle) { ::dlclose (m_hTraceHandle); } +#endif #endif m_hTraceHandle = NULL; @@ -320,7 +322,7 @@ int32_t CWelsCodecTrace::WriteString (int32_t iLevel, const str_t* pStr) { if (m_hTraceHandle) #endif { -#ifdef WIN32 +#ifdef _WIN32 switch (iLevel) { case WELS_LOG_ERROR: if (m_fpErrorTrace) @@ -382,7 +384,7 @@ IWelsTrace* CreateWelsTrace (EWelsTraceType eType, void_t* pParam) { case Wels_Trace_Type_File: pTrace = new CWelsTraceFile(); break; -#ifdef WIN32 +#ifdef _WIN32 case Wels_Trace_Type_WinDgb: pTrace = new CWelsTraceWinDgb(); break; diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp index 138855c7..65dd30a7 100644 --- a/codec/decoder/plus/src/welsDecoderExt.cpp +++ b/codec/decoder/plus/src/welsDecoderExt.cpp @@ -57,7 +57,7 @@ extern "C" { #include "error_code.h" #include "crt_util_safe_x.h" // Safe CRT routines like util for cross platforms #include -#if defined(WIN32) /*&& defined(_DEBUG)*/ +#if defined(_WIN32) /*&& defined(_DEBUG)*/ #include #include diff --git a/codec/encoder/core/inc/array_stack_align.h b/codec/encoder/core/inc/array_stack_align.h index a4674910..f4fad454 100644 --- a/codec/encoder/core/inc/array_stack_align.h +++ b/codec/encoder/core/inc/array_stack_align.h @@ -67,7 +67,7 @@ assert( ((_al) && !((_al) & ((_al) - 1))) && ((_al) >= sizeof(_tp)) ); /*_al should be power-of-2 and >= sizeof(_tp)*/\ _tp _nm ## _tEmP[(_sz)+(_al)/sizeof(_tp)-1]; \ _tp *_nm = _nm ## _tEmP + ((_al)/sizeof(_tp)-1); \ -_nm -= (((int32_t)_nm & ((_al)-1))/sizeof(_tp)); +_nm -= (((uintptr_t)_nm & ((_al)-1))/sizeof(_tp)); /* * ENFORCE_STACK_ALIGN_2D: force 2 dimension local pData aligned in stack @@ -90,7 +90,7 @@ _nm -= (((int32_t)_nm & ((_al)-1))/sizeof(_tp)); assert( ((_al) && !((_al) & ((_al) - 1))) && ((_al) >= sizeof(_tp)) ); /*_al should be power-of-2 and >= sizeof(_tp)*/\ _tp _nm ## _tEmP[(_cx)*(_cy)+(_al)/sizeof(_tp)-1]; \ _tp *_nm ## _tEmP_al = _nm ## _tEmP + ((_al)/sizeof(_tp)-1); \ -_nm ## _tEmP_al -= (((int32_t)_nm ## _tEmP_al & ((_al)-1))/sizeof(_tp)); \ +_nm ## _tEmP_al -= (((uintptr_t)_nm ## _tEmP_al & ((_al)-1))/sizeof(_tp)); \ _tp (*_nm)[(_cy)] = (_tp (*)[(_cy)])_nm ## _tEmP_al; /* diff --git a/codec/encoder/core/inc/as264_common.h b/codec/encoder/core/inc/as264_common.h index 211747b1..0ce49493 100644 --- a/codec/encoder/core/inc/as264_common.h +++ b/codec/encoder/core/inc/as264_common.h @@ -149,11 +149,11 @@ $(TargetPath) #endif//MEMORY_CHECK //#define ENABLE_TRACE_FILE -#if defined(WIN32) && defined(_DEBUG) +#if defined(_WIN32) && defined(_DEBUG) #ifdef ENABLE_TRACE_FILE #undef ENABLE_TRACE_FILE #endif//ENABLE_TRACE_FILE -#endif//WIN32 & _DEBUG +#endif//_WIN32 & _DEBUG #endif // _AS264_COMMON_H_ diff --git a/codec/encoder/core/inc/crt_util_safe_x.h b/codec/encoder/core/inc/crt_util_safe_x.h index 22a0123e..23a09905 100644 --- a/codec/encoder/core/inc/crt_util_safe_x.h +++ b/codec/encoder/core/inc/crt_util_safe_x.h @@ -46,7 +46,7 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #include #include diff --git a/codec/encoder/core/inc/macros.h b/codec/encoder/core/inc/macros.h index f30cd847..01e3040a 100644 --- a/codec/encoder/core/inc/macros.h +++ b/codec/encoder/core/inc/macros.h @@ -273,7 +273,7 @@ return x; #else -#ifdef _MSC_VER +#if defined(WIN32) && !defined(WIN64) static inline uint32_t ENDIAN_FIX (uint32_t x) { __asm { mov eax, x diff --git a/codec/encoder/core/inc/measure_time.h b/codec/encoder/core/inc/measure_time.h index f22fad47..0ff197b7 100644 --- a/codec/encoder/core/inc/measure_time.h +++ b/codec/encoder/core/inc/measure_time.h @@ -50,10 +50,10 @@ #include #endif #include -#if defined(WIN32) +#if defined(_WIN32) #include //#include // need static lib winmm.lib for link for such windows 95/98 mm timer -#endif//#if WIN32 +#endif//#if _WIN32 /*! * \brief time cost measure utilization @@ -68,7 +68,7 @@ struct timeval tv_date; gettimeofday (&tv_date, NULL); return ((int64_t) tv_date.tv_sec * 1000000 + (int64_t) tv_date.tv_usec); #else -#if defined (WIN32) +#if defined (_WIN32) static int64_t iMeasureTimeFreq = 0; // static BOOL_T support_high_resolution_perf_flag = TRUE; int64_t iMeasureTimeCur = 0; @@ -99,7 +99,7 @@ struct _timeb tb; _ftime (&tb); return ((int64_t)tb.time * (1000) + (int64_t)tb.millitm) * (1000); -#endif//#if WIN32 +#endif//#if _WIN32 #endif//!(defined(_MSC_VER) || defined(__MINGW32__)) } diff --git a/codec/encoder/core/inc/mt_defs.h b/codec/encoder/core/inc/mt_defs.h index 156c3555..55ad0595 100644 --- a/codec/encoder/core/inc/mt_defs.h +++ b/codec/encoder/core/inc/mt_defs.h @@ -182,7 +182,7 @@ int32_t iEndMbIndex; // exclusive typedef struct TagSliceThreading { SSliceThreadPrivateData* pThreadPEncCtx;// thread context, [iThreadIdx] WELS_THREAD_HANDLE* pThreadHandles;// thread handles, [iThreadIdx] -#ifdef WIN32 +#ifdef _WIN32 WELS_EVENT* pSliceCodedEvent;// events for slice coded state, [iThreadIdx] WELS_EVENT* pReadySliceCodingEvent; // events for slice coding ready, [iThreadIdx] WELS_EVENT* pFinSliceCodingEvent; // notify slice coding thread is done @@ -190,19 +190,19 @@ WELS_EVENT* pExitEncodeEvent; // event for exit encoding event #else WELS_EVENT* pSliceCodedEvent[MAX_THREADS_NUM];// events for slice coded state, [iThreadIdx] WELS_EVENT* pReadySliceCodingEvent[MAX_THREADS_NUM]; // events for slice coding ready, [iThreadIdx] -#endif//WIN32 +#endif//_WIN32 #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) #if defined(__GNUC__) WELS_THREAD_HANDLE* pUpdateMbListThrdHandles; // thread handles for update mb list thread, [iThreadIdx] #endif//__GNUC__ -#ifdef WIN32 +#ifdef _WIN32 WELS_EVENT* pUpdateMbListEvent; // signal to update mb list neighbor for various slices WELS_EVENT* pFinUpdateMbListEvent; // signal to indicate finish updating mb list #else WELS_EVENT* pUpdateMbListEvent[MAX_THREADS_NUM]; // signal to update mb list neighbor for various slices WELS_EVENT* pFinUpdateMbListEvent[MAX_THREADS_NUM]; // signal to indicate finish updating mb list -#endif//WIN32 +#endif//_WIN32 #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) WELS_MUTEX mutexSliceNumUpdate; // for dynamic slicing mode MT diff --git a/codec/encoder/core/inc/slice_multi_threading.h b/codec/encoder/core/inc/slice_multi_threading.h index 89f04c7d..512d1165 100644 --- a/codec/encoder/core/inc/slice_multi_threading.h +++ b/codec/encoder/core/inc/slice_multi_threading.h @@ -96,13 +96,13 @@ int32_t CreateSliceThreads (sWelsEncCtx* pCtx); void ResetCountBsSizeInPartitions (uint32_t* pCountBsSizeList, const int32_t kiPartitionCnt); #endif//PACKING_ONE_SLICE_PER_LAYER -#ifdef WIN32 +#ifdef _WIN32 int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLayerBsInfo, const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const BOOL_T kbIsDynamicSlicingMode); #else int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** ppEventsList, SLayerBSInfo* pLayerBsInfo, const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const BOOL_T kbIsDynamicSlicingMode); -#endif//WIN32 +#endif//_WIN32 int32_t DynamicDetectCpuCores(); diff --git a/codec/encoder/core/src/encoder.cpp b/codec/encoder/core/src/encoder.cpp index 811ae865..17f642de 100644 --- a/codec/encoder/core/src/encoder.cpp +++ b/codec/encoder/core/src/encoder.cpp @@ -337,14 +337,14 @@ extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileNam if (bDependencyRecFlag[kiDid]) { if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) // confirmed_safe_unsafe_usage -#if defined(__GNUC__) || (defined(WIN32) && defined(_MSC_VER) && (_MSC_VER<1500)) +#if defined(__GNUC__) || (defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER<1500)) pDumpRecFile = FOPEN (kpFileName, "ab"); -#elif defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#elif defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, kpFileName, "ab"); #endif//__GNUC__.. else { str_t sDependencyRecFileName[16] = {0}; -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage FOPEN (&pDumpRecFile, sDependencyRecFileName, "ab"); #else @@ -356,14 +356,14 @@ extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileNam fseek (pDumpRecFile, 0, SEEK_END); } else { if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, kpFileName, "wb"); #else pDumpRecFile = FOPEN (kpFileName, "wb"); #endif//WIN32.. } else { str_t sDependencyRecFileName[16] = {0}; -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage FOPEN (&pDumpRecFile, sDependencyRecFileName, "wb"); #else @@ -423,13 +423,13 @@ void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) { if (bRecFlag) { if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, kpFileName, "ab"); #else pDumpRecFile = FOPEN (kpFileName, "ab"); #endif//WIN32 } else { -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, "rec.yuv", "ab"); #else pDumpRecFile = FOPEN ("rec.yuv", "ab"); @@ -439,13 +439,13 @@ void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) { fseek (pDumpRecFile, 0, SEEK_END); } else { if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, kpFileName, "wb"); #else pDumpRecFile = FOPEN (kpFileName, "wb"); #endif//WIN32 } else { -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 FOPEN (&pDumpRecFile, "rec.yuv", "wb"); #else pDumpRecFile = FOPEN ("rec.yuv", "wb"); diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp index 1f3bc30e..99f7f361 100644 --- a/codec/encoder/core/src/encoder_ext.cpp +++ b/codec/encoder/core/src/encoder_ext.cpp @@ -2072,7 +2072,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar #if defined(__GNUC__) pCtx->pFileLog = FOPEN (fname, "wt+"); #else//WIN32 -#if defined(WIN32) && defined(_MSC_VER) +#if defined(_WIN32) && defined(_MSC_VER) #if _MSC_VER >= 1500 FOPEN (&pCtx->pFileLog, fname, "wt+"); #else @@ -2236,7 +2236,7 @@ void WelsUninitEncoderExt (sWelsEncCtx** ppCtx) { const int32_t iThreadCount = (*ppCtx)->pSvcParam->iCountThreadsNum; int32_t iThreadIdx = 0; -#if defined(WIN32) +#if defined(_WIN32) if ((*ppCtx)->pSliceThreading->pExitEncodeEvent != NULL) { do { if ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx] != NULL) // iThreadIdx is already created successfully @@ -3351,7 +3351,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur t_bs_append = WelsTime() - t_bs_append; if (pCtx->pSliceThreading->pFSliceDiff) { fprintf (pCtx->pSliceThreading->pFSliceDiff, -#if defined(WIN32) +#if defined(_WIN32) "%6I64d us consumed at AppendSliceToFrameBs() for coding_idx: %d iDid: %d qid: %d\n", #else "%6lld us consumed at AppendSliceToFrameBs() for coding_idx: %d iDid: %d qid: %d\n", @@ -3391,7 +3391,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur while (1) { if (iIndexOfSliceToBeCoded >= iSliceCount && iNumThreadsRunning <= 0) break; -#ifdef WIN32 +#ifdef _WIN32 WELS_THREAD_ERROR_CODE lwait = 0; int32_t iEventId = -1; @@ -3440,7 +3440,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur } else { iNumThreadsRunning = 0; } -#endif//WIN32 +#endif//_WIN32 }//while(1) // all slices are finished coding here diff --git a/codec/encoder/core/src/memory_align.cpp b/codec/encoder/core/src/memory_align.cpp index 8c3bc6fe..d33b5262 100644 --- a/codec/encoder/core/src/memory_align.cpp +++ b/codec/encoder/core/src/memory_align.cpp @@ -111,7 +111,7 @@ void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { return NULL; pAlignedBuffer = pBuf + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt; - pAlignedBuffer -= ((int32_t) pAlignedBuffer & kiAlignedBytes); + pAlignedBuffer -= ((uintptr_t) pAlignedBuffer & kiAlignedBytes); * ((void**) (pAlignedBuffer - kiSizeOfVoidPointer)) = pBuf; * ((int32_t*) (pAlignedBuffer - (kiSizeOfVoidPointer + kiSizeOfInt))) = kiPayloadSize; diff --git a/codec/encoder/core/src/slice_multi_threading.cpp b/codec/encoder/core/src/slice_multi_threading.cpp index 47834852..f33e2582 100644 --- a/codec/encoder/core/src/slice_multi_threading.cpp +++ b/codec/encoder/core/src/slice_multi_threading.cpp @@ -309,11 +309,11 @@ void DynamicAdjustSlicing (sWelsEncCtx* pCtx, const int32_t kiThreadNum = pCtx->pSvcParam->iCountThreadsNum; int32_t iThreadIdx = 0; do { -#ifdef WIN32 +#ifdef _WIN32 WelsEventSignal (&pCtx->pSliceThreading->pUpdateMbListEvent[iThreadIdx]); #else WelsEventSignal (pCtx->pSliceThreading->pUpdateMbListEvent[iThreadIdx]); -#endif//WIN32 +#endif//_WIN32 ++ iThreadIdx; } while (iThreadIdx < kiThreadNum); @@ -367,7 +367,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara "pThreadHandles"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pThreadHandles), FreeMemorySvc (ppCtx)) -#ifdef WIN32 +#ifdef _WIN32 pSmt->pSliceCodedEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, "pSliceCodedEvent"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pSliceCodedEvent), FreeMemorySvc (ppCtx)) pSmt->pReadySliceCodingEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, @@ -375,7 +375,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pReadySliceCodingEvent), FreeMemorySvc (ppCtx)) pSmt->pFinSliceCodingEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, "pFinSliceCodingEvent"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pFinSliceCodingEvent), FreeMemorySvc (ppCtx)) -#endif//WIN32 +#endif//_WIN32 #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) #if defined(__GNUC__) @@ -383,18 +383,18 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara "pUpdateMbListThrdHandles"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pUpdateMbListThrdHandles), FreeMemorySvc (ppCtx)) #endif//__GNUC__ -#ifdef WIN32 +#ifdef _WIN32 pSmt->pUpdateMbListEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, "pUpdateMbListEvent"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pUpdateMbListEvent), FreeMemorySvc (ppCtx)) pSmt->pFinUpdateMbListEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, "pFinUpdateMbListEvent"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pFinUpdateMbListEvent), FreeMemorySvc (ppCtx)) -#endif//WIN32 +#endif//_WIN32 #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) -#ifdef WIN32 +#ifdef _WIN32 pSmt->pExitEncodeEvent = (WELS_EVENT*)pMa->WelsMalloc (sizeof (WELS_EVENT) * iThreadNum, "pExitEncodeEvent"); WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pExitEncodeEvent), FreeMemorySvc (ppCtx)) -#endif//WIN32 +#endif//_WIN32 #if defined(DYNAMIC_SLICE_ASSIGN) || defined(MT_DEBUG) iIdx = 0; @@ -428,11 +428,11 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara fclose (pSmt->pFSliceDiff); pSmt->pFSliceDiff = NULL; } -#ifdef WIN32 +#ifdef _WIN32 pSmt->pFSliceDiff = fopen (".\\slice_time.txt", "wt+"); #else pSmt->pFSliceDiff = fopen ("/tmp/slice_time.txt", "wt+"); -#endif//WIN32 +#endif//_WIN32 #endif//MT_DEBUG #if defined(ENABLE_TRACE_MT) @@ -452,7 +452,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara pSmt->pThreadHandles[iIdx] = 0; #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) -#ifdef WIN32 +#ifdef _WIN32 WelsEventInit (&pSmt->pUpdateMbListEvent[iIdx]); WelsEventInit (&pSmt->pFinUpdateMbListEvent[iIdx]); #else @@ -468,10 +468,10 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara #if defined(ENABLE_TRACE_MT) WelsLog ((*ppCtx), WELS_LOG_INFO, "[MT] Open pFinUpdateMbListEvent%d named(%s) ret%d err%d\n", iIdx, name, err, errno); #endif -#endif//WIN32 +#endif//_WIN32 #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) -#ifdef WIN32 +#ifdef _WIN32 WelsEventInit (&pSmt->pSliceCodedEvent[iIdx]); WelsEventInit (&pSmt->pReadySliceCodingEvent[iIdx]); WelsEventInit (&pSmt->pFinSliceCodingEvent[iIdx]); @@ -490,7 +490,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara WelsLog ((*ppCtx), WELS_LOG_INFO, "[MT] Open pReadySliceCodingEvent%d = 0x%p named(%s) ret%d err%d\n", iIdx, (void*)pSmt->pReadySliceCodingEvent[iIdx]), (void*) (*ppCtx), err, errno); #endif -#endif//WIN32 +#endif//_WIN32 ++ iIdx; } @@ -557,7 +557,7 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { return; while (iIdx < iThreadNum) { -#ifdef WIN32 +#ifdef _WIN32 if (pSmt->pThreadHandles != NULL && pSmt->pThreadHandles[iIdx] != NULL) WelsThreadDestroy (&pSmt->pThreadHandles[iIdx]); @@ -592,12 +592,12 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { ename[used_len] = '\0'; WelsEventClose (pSmt->pFinUpdateMbListEvent[iIdx], ename); #endif//DYNAMIC_SLICE_ASSIGN && TRY_SLICING_BALANCE -#endif//WIN32 +#endif//_WIN32 ++ iIdx; } -#ifdef WIN32 +#ifdef _WIN32 if (pSmt->pExitEncodeEvent != NULL) { pMa->WelsFree (pSmt->pExitEncodeEvent, "pExitEncodeEvent"); pSmt->pExitEncodeEvent = NULL; @@ -614,7 +614,7 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { pMa->WelsFree (pSmt->pFinSliceCodingEvent, "pFinSliceCodingEvent"); pSmt->pFinSliceCodingEvent = NULL; } -#endif//WIN32 +#endif//_WIN32 #ifdef PACKING_ONE_SLICE_PER_LAYER if (NULL != pSmt->pCountBsSizeInPartition) { @@ -669,7 +669,7 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) -#ifdef WIN32 +#ifdef _WIN32 if (pSmt->pUpdateMbListEvent != NULL) { pMa->WelsFree (pSmt->pUpdateMbListEvent, "pUpdateMbListEvent"); pSmt->pUpdateMbListEvent = NULL; @@ -683,7 +683,7 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { pMa->WelsFree (pSmt->pUpdateMbListThrdHandles, "pUpdateMbListThrdHandles"); pSmt->pUpdateMbListThrdHandles = NULL; } -#endif//WIN32 +#endif//_WIN32 #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) @@ -901,7 +901,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { SDqLayer* pCurDq = NULL; SSlice* pSlice = NULL; SWelsSliceBs* pSliceBs = NULL; -#ifdef WIN32 +#ifdef _WIN32 WELS_EVENT pEventsList[3]; int32_t iEventCount = 0; #endif @@ -925,16 +925,16 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { iThreadIdx = pPrivateData->iThreadIndex; iEventIdx = iThreadIdx; -#ifdef WIN32 +#ifdef _WIN32 pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pReadySliceCodingEvent[iEventIdx]; pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pExitEncodeEvent[iEventIdx]; #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pUpdateMbListEvent[iEventIdx]; #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) -#endif//WIN32 +#endif//_WIN32 do { -#ifdef WIN32 +#ifdef _WIN32 iWaitRet = WelsMultipleEventsWaitSingleBlocking (iEventCount, &pEventsList[0], (uint32_t) - 1); // blocking until at least one event is @@ -1058,7 +1058,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { pSliceBs->bSliceCodedFlag = TRUE; #endif//MT_DEBUG_BS_WR -#ifdef WIN32 +#ifdef _WIN32 WelsEventSignal ( &pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice #else @@ -1174,14 +1174,14 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { if (uiThrdRet) // any exception?? break; -#ifdef WIN32 +#ifdef _WIN32 WelsEventSignal (&pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice #else WelsEventSignal (pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice #endif//WIN32 } } -#ifdef WIN32 +#ifdef _WIN32 else if (WELS_THREAD_ERROR_WAIT_OBJECT_0 + 1 == iWaitRet) { // exit thread signal uiThrdRet = 0; break; @@ -1206,7 +1206,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { } } while (1); -#ifdef WIN32 +#ifdef _WIN32 WelsEventSignal (&pEncPEncCtx->pSliceThreading->pFinSliceCodingEvent[iEventIdx]); // notify to mother encoding threading #endif//WIN32 @@ -1216,7 +1216,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { int32_t CreateSliceThreads (sWelsEncCtx* pCtx) { const int32_t kiThreadCount = pCtx->pSvcParam->iCountThreadsNum; int32_t iIdx = 0; -#if defined(WIN32) && defined(BIND_CPU_CORES_TO_THREADS) +#if defined(_WIN32) && defined(BIND_CPU_CORES_TO_THREADS) DWORD dwProcessAffinity; DWORD dwSystemAffinity; GetProcessAffinityMask (GetCurrentProcess(), &dwProcessAffinity, &dwSystemAffinity); @@ -1225,7 +1225,7 @@ int32_t CreateSliceThreads (sWelsEncCtx* pCtx) { while (iIdx < kiThreadCount) { WelsThreadCreate (&pCtx->pSliceThreading->pThreadHandles[iIdx], CodingSliceThreadProc, &pCtx->pSliceThreading->pThreadPEncCtx[iIdx], 0); -#if defined(WIN32) && defined(BIND_CPU_CORES_TO_THREADS) +#if defined(_WIN32) && defined(BIND_CPU_CORES_TO_THREADS) if (dwProcessAffinity > 1 && pCtx->pSliceThreading->pThreadHandles[iIdx] != NULL) { // multiple cores and thread created successfully DWORD dw = 0; @@ -1264,7 +1264,7 @@ void ResetCountBsSizeInPartitions (uint32_t* pCountBsSizeList, const int32_t iPa } #endif//PACKING_ONE_SLICE_PER_LAYER -#ifdef WIN32 +#ifdef _WIN32 int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi, const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const BOOL_T bIsDynamicSlicingMode) #else @@ -1299,7 +1299,7 @@ int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEven while (iIdx < kiEventCnt) { pPriData[iIdx].pLayerBs = pLbi; pPriData[iIdx].iSliceIndex = iIdx; -#ifdef WIN32 +#ifdef _WIN32 if (pEventsList[iIdx]) WelsEventSignal (&pEventsList[iIdx]); #else @@ -1325,7 +1325,7 @@ int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEven while (iIdx < kiEventCnt) { pPriData[iIdx].pLayerBs = pLbi; pPriData[iIdx].iSliceIndex = iIdx; -#ifdef WIN32 +#ifdef _WIN32 if (pEventsList[iIdx]) WelsEventSignal (&pEventsList[iIdx]); #else @@ -1371,7 +1371,7 @@ int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) { iT0 = WelsTime() - iT0; if (pCtx->pSliceThreading->pFSliceDiff) { fprintf (pCtx->pSliceThreading->pFSliceDiff, -#ifdef WIN32 +#ifdef _WIN32 "%6I64d us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n", #else "%6lld us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n", @@ -1429,7 +1429,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { iT1 = WelsTime() - iT1; if (pCtx->pSliceThreading->pFSliceDiff) { fprintf (pCtx->pSliceThreading->pFSliceDiff, -#ifdef WIN32 +#ifdef _WIN32 "%6I64d us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n", #else "%6lld us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n", diff --git a/codec/encoder/core/src/utils.cpp b/codec/encoder/core/src/utils.cpp index b7aa0a8f..958711a3 100644 --- a/codec/encoder/core/src/utils.cpp +++ b/codec/encoder/core/src/utils.cpp @@ -42,7 +42,7 @@ #include #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #include #include @@ -147,7 +147,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v if (pEncCtx) { time_t l_time; -#if defined(WIN32) +#if defined(_WIN32) #if defined(_MSC_VER) #if _MSC_VER >= 1500 struct tm t_now; @@ -159,7 +159,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v struct tm* t_now; #endif//WIN32 -#if defined( WIN32 ) +#if defined( _WIN32 ) struct _timeb tb; time (&l_time); @@ -229,7 +229,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v } if (iBufLeft > 0) { -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1500) +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1500) iCurUsed = strftime (&pBuf[iBufUsed], iBufLeft, "%y-%m-%d %H:%M:%S", &t_now); #else iCurUsed = strftime (&pBuf[iBufUsed], iBufLeft, "%y-%m-%d %H:%M:%S", t_now); @@ -243,7 +243,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v } if (iBufLeft > 0) { -#if defined (WIN32) +#if defined (_WIN32) #ifdef _MSC_VER #if _MSC_VER >= 1500 iCurUsed = SNPRINTF (&pBuf[iBufUsed], iBufLeft, iBufLeft, ".%03.3u]: ", tb.millitm); // confirmed_safe_unsafe_usage @@ -279,7 +279,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v } } if (iBufLeft > 0) { -#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1500) +#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1500) int32_t len = 0; len = _vscprintf (kpFmtStr, argv) // _vscprintf doesn't count + 1; // terminating '\0' @@ -305,7 +305,7 @@ void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, v pEncCtx->uiSizeLog += iBufUsed; } } else { -#if defined(WIN32) && defined(_DEBUG) +#if defined(_WIN32) && defined(_DEBUG) OutputDebugStringA (pBuf); #endif } @@ -346,7 +346,7 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) { #ifdef __GNUC__ STRCAT (strTraceFile, MAX_FNAME_LEN - len, "/wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage pEncCtx->pFileLog = FOPEN (strTraceFile, "wt+"); // confirmed_safe_unsafe_usage -#elif WIN32 +#elif _WIN32 STRCAT (strTraceFile, MAX_FNAME_LEN - len, "\\wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage #if _MSC_VER >= 1500 FOPEN (&pEncCtx->pFileLog, strTraceFile, "wt+"); // confirmed_safe_unsafe_usage diff --git a/codec/encoder/core/src/wels_preprocess.cpp b/codec/encoder/core/src/wels_preprocess.cpp index 796e23cf..fa59a6ee 100644 --- a/codec/encoder/core/src/wels_preprocess.cpp +++ b/codec/encoder/core/src/wels_preprocess.cpp @@ -30,7 +30,7 @@ * */ -#if defined(WIN32) +#if defined(_WIN32) #include #elif defined(MACOS) #include "bundleloader.h" @@ -91,7 +91,7 @@ CWelsLib::CWelsLib (void* pEncCtx) { m_pInterface[0] = m_pInterface[1] = NULL; #ifndef NO_DYNAMIC_VP -#if defined(WIN32) +#if defined(_WIN32) const str_t WelsVPLib[] = "welsvp.dll"; HMODULE shModule = LoadLibrary (WelsVPLib); if (!shModule) @@ -121,7 +121,7 @@ CWelsLib::CWelsLib (void* pEncCtx) { CWelsLib::~CWelsLib() { #ifndef NO_DYNAMIC_VP if (m_pVpLib) { -#if defined(WIN32) +#if defined(_WIN32) HMODULE shModule = (HMODULE)m_pVpLib; FreeLibrary (shModule); @@ -141,8 +141,9 @@ CWelsLib::~CWelsLib() { void* CWelsLib::QueryFunction (const str_t* pName) { void* pFunc = NULL; +#ifndef NO_DYNAMIC_VP if (m_pVpLib) { -#if defined(WIN32) +#if defined(_WIN32) HMODULE shModule = (HMODULE)m_pVpLib; pFunc = (void*)GetProcAddress (shModule, pName); @@ -157,6 +158,7 @@ void* CWelsLib::QueryFunction (const str_t* pName) { printf ("dlsym %s iRet=%p, err=%s\n", shModule, pFunc, dlerror()); #endif } +#endif return pFunc; } diff --git a/codec/encoder/plus/inc/welsCodecTrace.h b/codec/encoder/plus/inc/welsCodecTrace.h index ed4f852f..6b63a346 100644 --- a/codec/encoder/plus/inc/welsCodecTrace.h +++ b/codec/encoder/plus/inc/welsCodecTrace.h @@ -36,7 +36,7 @@ #include #include "typedefs.h" -#ifdef WIN32 +#ifdef _WIN32 typedef int32_t (*CM_WELS_TRACE) (const str_t* format, ...); #else typedef int32_t (*CM_WELS_TRACE2) (const str_t* dllname, const str_t* format, ...); @@ -60,7 +60,7 @@ class welsCodecTrace { public: static int32_t m_iTraceLevel; -#if defined WIN32 +#if defined _WIN32 static CM_WELS_TRACE m_fpDebugTrace; static CM_WELS_TRACE m_fpInfoTrace; static CM_WELS_TRACE m_fpWarnTrace; diff --git a/codec/encoder/plus/inc/welsEncoderExt.h b/codec/encoder/plus/inc/welsEncoderExt.h index 84cc162a..322bffc5 100644 --- a/codec/encoder/plus/inc/welsEncoderExt.h +++ b/codec/encoder/plus/inc/welsEncoderExt.h @@ -98,7 +98,7 @@ class CWelsH264SVCEncoder : public ISVCEncoder { private: sWelsEncCtx* m_pEncContext; -#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) welsCodecTrace* m_pWelsTrace; #endif SSourcePicture** m_pSrcPicList; diff --git a/codec/encoder/plus/src/welsCodecTrace.cpp b/codec/encoder/plus/src/welsCodecTrace.cpp index ba9bf425..d18d4fc1 100644 --- a/codec/encoder/plus/src/welsCodecTrace.cpp +++ b/codec/encoder/plus/src/welsCodecTrace.cpp @@ -30,7 +30,7 @@ * */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -52,7 +52,7 @@ #include #endif//MACOS -#ifdef WIN32 +#ifdef _WIN32 extern HANDLE g_hInstDll; #endif @@ -137,7 +137,7 @@ static void* GetProcessAddress (CFBundleRef bundle, const str_t* lpszprocname) { #endif int32_t welsCodecTrace::m_iTraceLevel = WELS_LOG_DEFAULT; -#if defined(WIN32) +#if defined(_WIN32) CM_WELS_TRACE welsCodecTrace::m_fpDebugTrace = NULL; CM_WELS_TRACE welsCodecTrace::m_fpInfoTrace = NULL; CM_WELS_TRACE welsCodecTrace::m_fpWarnTrace = NULL; @@ -164,7 +164,7 @@ welsCodecTrace::welsCodecTrace() { m_WelsTraceExistFlag = true; #else -#if defined WIN32 +#if defined _WIN32 HMODULE handle = ::GetModuleHandle ("welstrace.dll"); // HMODULE handle = ::GetModuleHandle("contrace.dll"); // for c7 if (NULL == handle) @@ -242,7 +242,8 @@ welsCodecTrace::welsCodecTrace() { } welsCodecTrace::~welsCodecTrace() { -#if defined WIN32 +#ifndef NO_DYNAMIC_VP +#if defined _WIN32 if (m_hTraceHandle) { ::FreeLibrary ((HMODULE)m_hTraceHandle); } @@ -254,6 +255,7 @@ welsCodecTrace::~welsCodecTrace() { if (m_hTraceHandle) { ::dlclose (m_hTraceHandle); } +#endif #endif m_hTraceHandle = NULL; @@ -270,7 +272,7 @@ int32_t welsCodecTrace::WelsTraceModuleIsExist() { } void welsCodecTrace::TraceString (int32_t iLevel, const str_t* str) { -#ifdef WIN32 +#ifdef _WIN32 switch (iLevel) { case WELS_LOG_ERROR: if (m_fpErrorTrace) @@ -335,7 +337,7 @@ void welsCodecTrace::CODEC_TRACE (void* ignore, const int32_t iLevel, const str_ STRNCPY (WStr_Format, MAX_LOG_SIZE, Str_Format, STRNLEN (Str_Format, MAX_LOG_SIZE)); // confirmed_safe_unsafe_usage STRNCPY (pBuf, MAX_LOG_SIZE, "[ENCODER]: ", len); // confirmed_safe_unsafe_usage -#if defined(WIN32) +#if defined(_WIN32) #if defined(_MSC_VER) #if _MSC_VER>=1500 VSPRINTF (pBuf + len, MAX_LOG_SIZE - len, WStr_Format, vl); // confirmed_safe_unsafe_usage diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp index ceaf6056..4f962806 100644 --- a/codec/encoder/plus/src/welsEncoderExt.cpp +++ b/codec/encoder/plus/src/welsEncoderExt.cpp @@ -42,7 +42,7 @@ #include "ref_list_mgr_svc.h" #include -#if defined(WIN32) /*&& defined(_DEBUG)*/ +#if defined(_WIN32) /*&& defined(_DEBUG)*/ #include #include @@ -60,7 +60,7 @@ namespace WelsSVCEnc { */ CWelsH264SVCEncoder::CWelsH264SVCEncoder() : m_pEncContext (NULL), -#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) m_pWelsTrace (NULL), #endif m_pSrcPicList (NULL), @@ -86,7 +86,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() #ifdef OUTPUT_BIT_STREAM time_t tTime; -#if defined( WIN32 ) +#if defined( _WIN32 ) #if defined(_MSC_VER) #if _MSC_VER>=1500 struct tm tTimeNow; @@ -115,7 +115,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() gettimeofday (&tTimev, NULL); #endif//WIN32 -#ifdef WIN32 +#ifdef _WIN32 #if defined(_MSC_VER) #if _MSC_VER>=1500 iBufferUsed += SNPRINTF (strStreamFileName, iBufferLeft, iBufferLeft, "enc_bs_0x%p_", (void*)this); @@ -168,7 +168,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() } if (iBufferLeft > iBufferUsed) { -#ifdef WIN32 +#ifdef _WIN32 #if defined(_MSC_VER) #if _MSC_VER>=1500 iBufferUsed += SNPRINTF (&strStreamFileName[iBufferUsed], iBufferLeft, iBufferLeft, ".%03.3u.264", tTimeb.millitm); @@ -183,7 +183,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() } if (iBufferLeftSize > iBufferUsedSize) { -#ifdef WIN32 +#ifdef _WIN32 #if defined(_MSC_VER) #if _MSC_VER>=1500 iBufferUsedSize += SNPRINTF (&strLenFileName[iBufferUsedSize], iBufferLeftSize, iBufferLeftSize, ".%03.3u.len", @@ -222,7 +222,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { WelsLog (NULL, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()\n"); -#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) if (m_pWelsTrace != NULL) { delete m_pWelsTrace; @@ -256,7 +256,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { } void CWelsH264SVCEncoder::InitEncoder (void) { -#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) #ifdef REC_FRAME_COUNT WelsLog (m_pEncContext, WELS_LOG_INFO, @@ -1203,11 +1203,6 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { using namespace WelsSVCEnc; int32_t CreateSVCEncoder (ISVCEncoder** ppEncoder) { - assert (ppEncoder); - - if (NULL == ppEncoder) - return 1; - if ((*ppEncoder = new CWelsH264SVCEncoder()) != NULL) { return 0; } diff --git a/processing/build/win32/WelsVP_2008.vcproj b/processing/build/win32/WelsVP_2008.vcproj index 3d477a02..59097089 100644 --- a/processing/build/win32/WelsVP_2008.vcproj +++ b/processing/build/win32/WelsVP_2008.vcproj @@ -12,6 +12,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -240,6 +417,13 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} @@ -21,11 +29,21 @@ Unicode true + + DynamicLibrary + Unicode + true + DynamicLibrary Unicode false + + DynamicLibrary + Unicode + false + @@ -33,27 +51,48 @@ + + + + + + <_ProjectFileVersion>10.0.40219.1 .\..\..\..\bin\win32\Debug\ + .\..\..\..\bin\win64\Debug\ .\..\..\..\obj\vp\Debug\ + .\..\..\..\obj\vp\Debug\ true + true .\..\..\..\bin\win32\Release\ + .\..\..\..\bin\win64\Release\ .\..\..\..\obj\vp\Release\ + .\..\..\..\obj\vp\Release\ false + false false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + welsvp + welsvp welsvp + welsvp @@ -97,6 +136,46 @@ $(OutDir)\welsvp.bsc + + + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + Level3 + ProgramDatabase + + + true + + + $(OutDir)welsvp.dll + ../../src/common/WelsVP.def + true + true + $(OutDir)\welsvp.map + Windows + $(OutDir)\welsvp.pdb + $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pgd + + + + + + + $(OutDir)\welsvp.bsc + + @@ -143,6 +222,51 @@ $(OutDir)\welsvp.bsc + + + + + + + + + + + Full + false + Speed + WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + + $(OutDir)welsvp.dll + false + ../../src/common/WelsVP.def + false + true + $(OutDir)\welsvp.map + true + Windows + true + true + $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pdb + $(OutDir)\welsvp.pgd + + + + + + + $(OutDir)\welsvp.bsc + + @@ -193,59 +317,115 @@ nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/processing/build/win32/WelsVP_2010.vcxproj.filters b/processing/build/win32/WelsVP_2010.vcxproj.filters new file mode 100644 index 00000000..410f9807 --- /dev/null +++ b/processing/build/win32/WelsVP_2010.vcxproj.filters @@ -0,0 +1,165 @@ + + + + + headers + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {ecef07b7-65e1-45c4-9afc-39f7b07992a2} + + + {be24742a-75fa-49a4-b77e-a69d626d46c8} + + + {9f4c2bd3-e8d2-4276-adc6-273c0031971a} + + + {322f1cbe-435f-402b-8d86-71d023d5d407} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/processing/build/win32/WelsVP_2012.vcxproj b/processing/build/win32/WelsVP_2012.vcxproj index 8ef40658..2a9eae3d 100644 --- a/processing/build/win32/WelsVP_2012.vcxproj +++ b/processing/build/win32/WelsVP_2012.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} @@ -22,12 +30,24 @@ Unicode true + + DynamicLibrary + v110 + Unicode + true + DynamicLibrary v110 Unicode false + + DynamicLibrary + v110 + Unicode + false + @@ -35,9 +55,15 @@ + + + + + + <_ProjectFileVersion>11.0.61030.0 @@ -48,6 +74,12 @@ true welsvp + + true + welsvp + .\..\..\..\bin\win64\Debug\ + .\..\..\..\obj\vp\Debug\ + .\..\..\..\bin\win32\Release\ .\..\..\..\obj\vp\Release\ @@ -55,6 +87,13 @@ false welsvp + + false + false + welsvp + .\..\..\..\bin\win64\Release\ + .\..\..\..\obj\vp\Release\ + @@ -93,6 +132,45 @@ $(OutDir)\welsvp.bsc + + + + + + + Disabled + WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + Level3 + ProgramDatabase + + + true + + + $(OutDir)\welsvp.dll + ../../src/common/WelsVP.def + true + true + $(OutDir)\welsvp.map + Windows + $(OutDir)\welsvp.pdb + $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pgd + + + + + + + $(OutDir)\welsvp.bsc + + @@ -136,6 +214,51 @@ $(OutDir)\welsvp.bsc + + + + + + + + + + + Full + false + Speed + WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + false + + + Level3 + + + + + $(OutDir)\welsvp.dll + false + ../../src/common/WelsVP.def + false + true + $(OutDir)\welsvp.map + true + Windows + true + true + $(OutDir)\welsvp.pdb + $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pgd + + + + + + + $(OutDir)\welsvp.bsc + + @@ -186,59 +309,115 @@ nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + $(IntDir)%(Filename).obj;%(Outputs) + true + true diff --git a/processing/build/win32/WelsVP_2012.vcxproj.filters b/processing/build/win32/WelsVP_2012.vcxproj.filters new file mode 100644 index 00000000..ea3cd804 --- /dev/null +++ b/processing/build/win32/WelsVP_2012.vcxproj.filters @@ -0,0 +1,165 @@ + + + + + headers + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + sources + + + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + headers + + + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + ASM + + + + + {18a2a593-cf54-452e-bf69-5eaf9aac6518} + + + {5a921557-4f54-4838-80de-8c517b1d099b} + + + {0b628696-109b-4a2e-b11f-5e9e006b76ae} + + + {94dba5f3-1b39-4ccd-891b-6a70cb59f210} + + + + + resources + + + + + resources + + + \ No newline at end of file diff --git a/processing/src/common/thread.cpp b/processing/src/common/thread.cpp index 0f7b7ca3..3f40f01a 100644 --- a/processing/src/common/thread.cpp +++ b/processing/src/common/thread.cpp @@ -41,7 +41,7 @@ WELSVP_NAMESPACE_BEGIN -#if defined(WIN32) +#if defined(_WIN32) WELS_THREAD_ERROR_CODE WelsMutexInit (WELS_MUTEX* mutex) { InitializeCriticalSection (mutex); diff --git a/processing/src/common/thread.h b/processing/src/common/thread.h index bf8d4d20..cd2af073 100644 --- a/processing/src/common/thread.h +++ b/processing/src/common/thread.h @@ -42,7 +42,7 @@ #include "typedef.h" -#if defined(WIN32) +#if defined(_WIN32) #include @@ -59,7 +59,7 @@ WELSVP_NAMESPACE_BEGIN -#if defined(WIN32) +#if defined(_WIN32) typedef HANDLE WELS_THREAD_HANDLE; typedef CRITICAL_SECTION WELS_MUTEX; diff --git a/processing/src/common/typedef.h b/processing/src/common/typedef.h index 58b5293e..2ef3e638 100644 --- a/processing/src/common/typedef.h +++ b/processing/src/common/typedef.h @@ -52,7 +52,7 @@ WELSVP_NAMESPACE_BEGIN -#if defined(WIN32) || defined(_WIN32) || defined(_MSC_VER) +#if defined(_WIN32) || defined(_WIN32) || defined(_MSC_VER) typedef char int8_t ; typedef unsigned char uint8_t ; @@ -83,7 +83,7 @@ typedef char str_t ; // [comment]: specific use plain char only for charac typedef long long_t ; typedef int32_t bool_t ; -#if defined(WIN32) || defined(_MACH_PLATFORM) || defined(__GNUC__) +#if defined(_WIN32) || defined(_MACH_PLATFORM) || defined(__GNUC__) typedef float float_t ; typedef double double_t ; #endif