shithub: openh264

Download patch

ref: 099595696bef9d71fad02f08d9b6ecff37fbadc9
parent: 79838d4aad9726a1dbdb588b10f99699f8e0f4d8
author: Martin Storsjö <[email protected]>
date: Wed Feb 19 09:39:43 EST 2014 

Add the common processing include directories to the include path

This avoids using relative paths for including these files.


--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,10 @@
     -Icodec/encoder/core/inc \
     -Icodec/encoder/plus/inc
 
+PROCESSING_INCLUDES = \
+    -Icodec/processing/interface \
+    -Icodec/processing/src/common
+
 GTEST_INCLUDES = \
     -Igtest \
     -Igtest/include
--- a/codec/processing/build/win32/WelsVP_2008.vcproj
+++ b/codec/processing/build/win32/WelsVP_2008.vcproj
@@ -52,7 +52,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../common/"

+				AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -137,7 +137,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../common/"

+				AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"

 				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -224,7 +224,7 @@
 				Optimization="3"

 				EnableIntrinsicFunctions="false"

 				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="../../../common/"

+				AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="false"

@@ -314,7 +314,7 @@
 				Optimization="3"

 				EnableIntrinsicFunctions="false"

 				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="../../../common/"

+				AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"

 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="false"

--- a/codec/processing/src/adaptivequantization/AdaptiveQuantization.h
+++ b/codec/processing/src/adaptivequantization/AdaptiveQuantization.h
@@ -41,10 +41,10 @@
 #ifndef WELSVP_ADAPTIVEQUANTIZATION_H
 #define WELSVP_ADAPTIVEQUANTIZATION_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 #include "cpu.h"
 
 WELSVP_NAMESPACE_BEGIN
--- a/codec/processing/src/backgrounddetection/BackgroundDetection.h
+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.h
@@ -41,10 +41,10 @@
 #ifndef WELSVP_BACKGROUNDDETECTION_H
 #define WELSVP_BACKGROUNDDETECTION_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/common/WelsFrameWork.h
+++ b/codec/processing/src/common/WelsFrameWork.h
@@ -42,7 +42,7 @@
 #ifndef WELSVP_WELSFRAMEWORK_H
 #define WELSVP_WELSFRAMEWORK_H
 
-#include "../../interface/IWelsVP.h"
+#include "IWelsVP.h"
 #include "util.h"
 #include "thread.h"
 
--- a/codec/processing/src/common/util.h
+++ b/codec/processing/src/common/util.h
@@ -50,7 +50,7 @@
 
 #include "typedef.h"
 #include "memory.h"
-#include "../../interface/IWelsVP.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/complexityanalysis/ComplexityAnalysis.h
+++ b/codec/processing/src/complexityanalysis/ComplexityAnalysis.h
@@ -42,10 +42,10 @@
 #ifndef WELSVP_COMPLEXITYANALYSIS_H
 #define WELSVP_COMPLEXITYANALYSIS_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/denoise/denoise.cpp
+++ b/codec/processing/src/denoise/denoise.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "denoise.h"
-#include "../common/cpu.h"
+#include "cpu.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/denoise/denoise.h
+++ b/codec/processing/src/denoise/denoise.h
@@ -42,10 +42,10 @@
 #ifndef WELSVP_DENOISE_H
 #define WELSVP_DENOISE_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 
 #define DENOISE_GRAY_RADIUS (1)
--- a/codec/processing/src/downsample/downsample.cpp
+++ b/codec/processing/src/downsample/downsample.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "downsample.h"
-#include "../common/cpu.h"
+#include "cpu.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/downsample/downsample.h
+++ b/codec/processing/src/downsample/downsample.h
@@ -42,9 +42,9 @@
 #ifndef WELSVP_DOWNSAMPLE_H
 #define WELSVP_DOWNSAMPLE_H
 
-#include "../common/util.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/imagerotate/imagerotate.h
+++ b/codec/processing/src/imagerotate/imagerotate.h
@@ -42,9 +42,9 @@
 #ifndef WELSVP_IMAGEROTATE_H
 #define WELSVP_IMAGEROTATE_H
 
-#include "../common/util.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
+++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "SceneChangeDetection.h"
-#include "../common/cpu.h"
+#include "cpu.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/scenechangedetection/SceneChangeDetection.h
+++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.h
@@ -42,10 +42,10 @@
 #ifndef WELSVP_SCENECHANGEDETECTION_H
 #define WELSVP_SCENECHANGEDETECTION_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 #include "SceneChangeDetectionCommon.h"
 
 WELSVP_NAMESPACE_BEGIN
--- a/codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h
+++ b/codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h
@@ -41,10 +41,10 @@
 #ifndef WELSVP_SCENECHANGEDETECTIONCOMMON_H
 #define WELSVP_SCENECHANGEDETECTIONCOMMON_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/vaacalc/vaacalcfuncs.cpp
+++ b/codec/processing/src/vaacalc/vaacalcfuncs.cpp
@@ -30,7 +30,7 @@
  *
  */
 
-#include "../common/util.h"
+#include "util.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/vaacalc/vaacalculation.cpp
+++ b/codec/processing/src/vaacalc/vaacalculation.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "vaacalculation.h"
-#include "../common/cpu.h"
+#include "cpu.h"
 
 WELSVP_NAMESPACE_BEGIN
 
--- a/codec/processing/src/vaacalc/vaacalculation.h
+++ b/codec/processing/src/vaacalc/vaacalculation.h
@@ -42,10 +42,10 @@
 #ifndef WELSVP_VAACALCULATION_H
 #define WELSVP_VAACALCULATION_H
 
-#include "../common/util.h"
-#include "../common/memory.h"
-#include "../common/WelsFrameWork.h"
-#include "../../interface/IWelsVP.h"
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
 
 WELSVP_NAMESPACE_BEGIN