generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #182 from mstorsjo/move-threadlib

Browse Source 
Move the WelsThreadLib files to the common directory/library
This commit is contained in:
Ethan Hugg 2014-01-21 10:33:50 -08:00
commit ae0bd3ee02
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codec/build/win32/enc/WelsEncCore.vcproj
View File

@ -52,7 +52,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api;"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM;MT_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -132,7 +132,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api;"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc;"
PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM;MT_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -214,7 +214,7 @@
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM;MT_ENABLED;"
StringPooling="true"
RuntimeLibrary="2"
@ -298,7 +298,7 @@
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc,..\..\..\WelsThreadLib\api"
AdditionalIncludeDirectories="..\..\..\common;..\..\..\encoder\core\inc,..\..\..\api\svc"
PreprocessorDefinitions="WIN64;NDEBUG;_LIB;MT_ENABLED;X86_ASM"
StringPooling="true"
RuntimeLibrary="2"
@ -1416,7 +1416,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\WelsThreadLib\src\WelsThreadLib.cpp"
RelativePath="..\..\..\common\WelsThreadLib.cpp"
>
</File>
</Filter>
@ -1649,7 +1649,7 @@
>
</File>
<File
RelativePath="..\..\..\WelsThreadLib\api\WelsThreadLib.h"
RelativePath="..\..\..\common\WelsThreadLib.h"
>
</File>
</Filter>

3
codec/WelsThreadLib/src/WelsThreadLib.cpp → codec/common/WelsThreadLib.cpp
View File

@ -42,6 +42,8 @@
#include "WelsThreadLib.h"
#include <stdio.h>
#ifdef MT_ENABLED
#ifdef _WIN32
void WelsSleep (uint32_t dwMilliseconds) {
@ -510,4 +512,5 @@ WELS_THREAD_ERROR_CODE WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* p
#endif
#endif // MT_ENABLED

0
codec/WelsThreadLib/api/WelsThreadLib.h → codec/common/WelsThreadLib.h
View File

1
codec/common/targets.mk
View File

@ -4,6 +4,7 @@ COMMON_CPP_SRCS=\
$(COMMON_SRCDIR)/./cpu.cpp\
$(COMMON_SRCDIR)/./deblocking_common.cpp\
$(COMMON_SRCDIR)/./logging.cpp\
$(COMMON_SRCDIR)/./WelsThreadLib.cpp\
COMMON_OBJS += $(COMMON_CPP_SRCS:.cpp=.o)
ifeq ($(USE_ASM), Yes)