shithub: openh264

--- a/Makefile

+++ b/Makefile

@@ -1,3 +1,10 @@

+SRC_PATH=$(word 1, $(dir $(MAKEFILE_LIST)))

+vpath %.c $(SRC_PATH)

+vpath %.cc $(SRC_PATH)

+vpath %.cpp $(SRC_PATH)

+vpath %.asm $(SRC_PATH)

+vpath %.S $(SRC_PATH)

 OS=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:].)

 ARCH=$(shell uname -m)

 LIBPREFIX=lib

@@ -20,13 +27,13 @@

 GMP_API_BRANCH=master

 CCASFLAGS=$(CFLAGS)

-ifeq (,$(wildcard ./gmp-api))

+ifeq (,$(wildcard $(SRC_PATH)gmp-api))

 HAVE_GMP_API=No

 else

 HAVE_GMP_API=Yes

 endif

-ifeq (,$(wildcard ./gtest))

+ifeq (,$(wildcard $(SRC_PATH)gtest))

 HAVE_GTEST=No

 else

 HAVE_GTEST=Yes

@@ -46,7 +53,7 @@

 LDFLAGS += -fsanitize=address

 endif

-include build/platform-$(OS).mk

+include $(SRC_PATH)build/platform-$(OS).mk

 CFLAGS +=

@@ -68,49 +75,49 @@

 endif

-INCLUDES += -Icodec/api/svc -Icodec/common/inc

+INCLUDES += -I$(SRC_PATH)codec/api/svc -I$(SRC_PATH)codec/common/inc

 DECODER_INCLUDES += \

-    -Icodec/decoder/core/inc \

-    -Icodec/decoder/plus/inc

+    -I$(SRC_PATH)codec/decoder/core/inc \

+    -I$(SRC_PATH)codec/decoder/plus/inc

 ENCODER_INCLUDES += \

-    -Icodec/encoder/core/inc \

-    -Icodec/encoder/plus/inc \

-    -Icodec/processing/interface

+    -I$(SRC_PATH)codec/encoder/core/inc \

+    -I$(SRC_PATH)codec/encoder/plus/inc \

+    -I$(SRC_PATH)codec/processing/interface

 PROCESSING_INCLUDES += \

-    -Icodec/processing/interface \

-    -Icodec/processing/src/common \

-    -Icodec/processing/src/scrolldetection

+    -I$(SRC_PATH)codec/processing/interface \

+    -I$(SRC_PATH)codec/processing/src/common \

+    -I$(SRC_PATH)codec/processing/src/scrolldetection

 GTEST_INCLUDES += \

-    -Igtest \

-    -Igtest/include

+    -I$(SRC_PATH)gtest \

+    -I$(SRC_PATH)gtest/include

 CODEC_UNITTEST_INCLUDES += \

-    -Igtest/include \

-    -Icodec/common/inc \

+    -I$(SRC_PATH)gtest/include \

+    -I$(SRC_PATH)codec/common/inc \

 CONSOLE_COMMON_INCLUDES += \

-    -Icodec/console/common/inc

+    -I$(SRC_PATH)codec/console/common/inc

-H264DEC_INCLUDES += $(DECODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -Icodec/console/dec/inc

+H264DEC_INCLUDES += $(DECODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -I$(SRC_PATH)codec/console/dec/inc

 H264DEC_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,decoder) $(call LINK_LIB,common) $(call LINK_LIB,console_common)

 H264DEC_DEPS = $(LIBPREFIX)decoder.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX) $(LIBPREFIX)console_common.$(LIBSUFFIX)

-H264ENC_INCLUDES += $(ENCODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -Icodec/console/enc/inc

+H264ENC_INCLUDES += $(ENCODER_INCLUDES) $(CONSOLE_COMMON_INCLUDES) -I$(SRC_PATH)codec/console/enc/inc

 H264ENC_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common) $(call LINK_LIB,console_common)

 H264ENC_DEPS = $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX) $(LIBPREFIX)console_common.$(LIBSUFFIX)

 CODEC_UNITTEST_LDFLAGS = $(LINK_LOCAL_DIR) $(call LINK_LIB,gtest) $(call LINK_LIB,decoder) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common) $(CODEC_UNITTEST_LDFLAGS_SUFFIX)

 CODEC_UNITTEST_DEPS = $(LIBPREFIX)gtest.$(LIBSUFFIX) $(LIBPREFIX)decoder.$(LIBSUFFIX) $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX)

-DECODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -Itest -Itest/decoder

-ENCODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(ENCODER_INCLUDES) -Itest -Itest/encoder

-PROCESSING_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(PROCESSING_INCLUDES) -Itest -Itest/processing

-API_TEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) -Itest -Itest/api

-COMMON_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -Itest -Itest/common

-MODULE_INCLUDES += -Igmp-api

+DECODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -I$(SRC_PATH)test -I$(SRC_PATH)test/decoder

+ENCODER_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(ENCODER_INCLUDES) -I$(SRC_PATH)test -I$(SRC_PATH)test/encoder

+PROCESSING_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(PROCESSING_INCLUDES) -I$(SRC_PATH)test -I$(SRC_PATH)test/processing

+API_TEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) -I$(SRC_PATH)test -I$(SRC_PATH)test/api

+COMMON_UNITTEST_INCLUDES += $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -I$(SRC_PATH)test -I$(SRC_PATH)test/common

+MODULE_INCLUDES += -I$(SRC_PATH)gmp-api

 .PHONY: test gtest-bootstrap clean

@@ -144,20 +151,20 @@

 	@echo "You do not have gtest. Run make gtest-bootstrap to get gtest"

 endif

-include codec/common/targets.mk

-include codec/decoder/targets.mk

-include codec/encoder/targets.mk

-include codec/processing/targets.mk

+include $(SRC_PATH)codec/common/targets.mk

+include $(SRC_PATH)codec/decoder/targets.mk

+include $(SRC_PATH)codec/encoder/targets.mk

+include $(SRC_PATH)codec/processing/targets.mk

 ifeq ($(HAVE_GMP_API),Yes)

-include module/targets.mk

+include $(SRC_PATH)module/targets.mk

 endif

 ifneq (android, $(OS))

 ifneq (ios, $(OS))

-include codec/console/dec/targets.mk

-include codec/console/enc/targets.mk

-include codec/console/common/targets.mk

+include $(SRC_PATH)codec/console/dec/targets.mk

+include $(SRC_PATH)codec/console/enc/targets.mk

+include $(SRC_PATH)codec/console/common/targets.mk

 endif

 endif

@@ -209,12 +216,12 @@

@:

 ifeq ($(HAVE_GTEST),Yes)

-include build/gtest-targets.mk

-include test/api/targets.mk

-include test/decoder/targets.mk

-include test/encoder/targets.mk

-include test/processing/targets.mk

-include test/common/targets.mk

+include $(SRC_PATH)build/gtest-targets.mk

+include $(SRC_PATH)test/api/targets.mk

+include $(SRC_PATH)test/decoder/targets.mk

+include $(SRC_PATH)test/encoder/targets.mk

+include $(SRC_PATH)test/processing/targets.mk

+include $(SRC_PATH)test/common/targets.mk

 LIBRARIES += $(LIBPREFIX)ut.$(LIBSUFFIX)

 $(LIBPREFIX)ut.$(LIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(COMMON_UNITTEST_OBJS) $(API_TEST_OBJS)

@@ -235,6 +242,7 @@

 else

 ifeq (android,$(OS))

+ifeq (./,$(SRC_PATH))

 codec_unittest$(EXEEXT): $(LIBPREFIX)ut.$(SHAREDLIBSUFFIX)

 	cd ./test/build/android && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug

@@ -243,10 +251,17 @@

 	-cd ./test/build/android && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean

 else

-codec_unittest$(EXEEXT): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS)

+codec_unittest$(EXEEXT):

+	@:

+endif

+else

+codec_unittest$(EXEEXT): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS) | res

 	$(QUIET)rm -f $@

 	$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $+ $(CODEC_UNITTEST_LDFLAGS) $(LDFLAGS)

+res:

+	$(QUIET)if [ ! -e res ]; then ln -s $(SRC_PATH)res .; fi

 endif

 endif

@@ -256,3 +271,10 @@

 endif

 -include $(OBJS:.$(OBJ)=.d)

+OBJDIRS = $(sort $(dir $(OBJS)))

+$(OBJDIRS):

+	$(QUIET)mkdir -p $@

+$(OBJS): | $(OBJDIRS)

--- a/build/platform-android.mk

+++ b/build/platform-android.mk

@@ -1,5 +1,5 @@

 ARCH = arm

-include build/platform-arch.mk

+include $(SRC_PATH)build/platform-arch.mk

 SHAREDLIBSUFFIX = so

 NDKLEVEL = 12

 ifeq ($(ARCH), arm)

@@ -28,7 +28,7 @@

 $(error TARGET is not set)

 endif

-TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))

+TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=$(SRC_PATH)/codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))

 SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH)

 CXX = $(TOOLCHAINPREFIX)g++

@@ -50,6 +50,7 @@

 MODULE_INCLUDES = $(STL_INCLUDES)

 MODULE_LDFLAGS = $(STL_LIB)

+ifeq (./,$(SRC_PATH))

 binaries : decdemo encdemo

 decdemo: libraries

@@ -64,6 +65,12 @@

 	-cd ./codec/build/android/dec && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean

 clean_Android_enc:

 	-cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean

+else

+all:

+	@:

+clean_Android:

+	@:

+endif

 COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures

 COMMON_OBJS += $(COMMON_SRCDIR)/src/cpu-features.$(OBJ)

--- a/build/platform-arch.mk

+++ b/build/platform-arch.mk

@@ -1,10 +1,10 @@

 ifneq ($(filter %86 x86_64, $(ARCH)),)

-include build/platform-x86-common.mk

+include $(SRC_PATH)build/platform-x86-common.mk

 endif

 ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)

 ifeq ($(USE_ASM), Yes)

 ASM_ARCH = arm

-ASMFLAGS += -Icodec/common/arm/

+ASMFLAGS += -I$(SRC_PATH)codec/common/arm/

 CFLAGS += -DHAVE_NEON

 endif

 endif

@@ -11,7 +11,7 @@

 ifneq ($(filter arm64 aarch64, $(ARCH)),)

 ifeq ($(USE_ASM), Yes)

 ASM_ARCH = arm64

-ASMFLAGS += -Icodec/common/arm64/

+ASMFLAGS += -I$(SRC_PATH)codec/common/arm64/

 CFLAGS += -DHAVE_NEON_AARCH64

 endif

 endif

--- a/build/platform-darwin.mk

+++ b/build/platform-darwin.mk

@@ -1,4 +1,4 @@

-include build/platform-arch.mk

+include $(SRC_PATH)build/platform-arch.mk

 SHAREDLIBSUFFIX = dylib

 SHARED = -dynamiclib

 CFLAGS += -Wall -fPIC -MMD -MP

--- a/build/platform-freebsd.mk

+++ b/build/platform-freebsd.mk

@@ -1,4 +1,4 @@

-include build/platform-arch.mk

+include $(SRC_PATH)build/platform-arch.mk

 SHAREDLIBSUFFIX = so

 CFLAGS += -fPIC

 LDFLAGS += -lpthread

--- a/build/platform-ios.mk

+++ b/build/platform-ios.mk

@@ -1,5 +1,5 @@

 ARCH = armv7

-include build/platform-darwin.mk

+include $(SRC_PATH)build/platform-darwin.mk

 CXX = clang++

 CC = clang

 ifneq ($(filter %86 x86_64, $(ARCH)),)

--- a/build/platform-linux.mk

+++ b/build/platform-linux.mk

@@ -1,4 +1,4 @@

-include build/platform-arch.mk

+include $(SRC_PATH)build/platform-arch.mk

 SHAREDLIBSUFFIX = so

 CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP

 LDFLAGS += -lpthread

--- a/build/platform-mingw_nt.mk

+++ b/build/platform-mingw_nt.mk

@@ -1,4 +1,4 @@

-include build/platform-x86-common.mk

+include $(SRC_PATH)build/platform-x86-common.mk

 SHAREDLIBSUFFIX = dll

 CFLAGS += -MMD -MP

 LDFLAGS +=

--- a/build/platform-msvc-common.mk

+++ b/build/platform-msvc-common.mk

@@ -1,4 +1,4 @@

-include build/platform-arch.mk

+include $(SRC_PATH)build/platform-arch.mk

 ifeq ($(ASM_ARCH), x86)

 ifeq ($(ENABLE64BIT), Yes)

 ASMFLAGS += -f win64

--- a/build/platform-msvc-wp.mk

+++ b/build/platform-msvc-wp.mk

@@ -1,5 +1,5 @@

 ARCH = arm

-include build/platform-msvc-common.mk

+include $(SRC_PATH)build/platform-msvc-common.mk

 CFLAGS_OPT += -MD

 CFLAGS_DEBUG += -MDd

 CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP

--- a/build/platform-msvc.mk

+++ b/build/platform-msvc.mk

@@ -1,4 +1,4 @@

-include build/platform-msvc-common.mk

+include $(SRC_PATH)build/platform-msvc-common.mk

 LDFLAGS += user32.lib

 CFLAGS_OPT += -MT

 CFLAGS_DEBUG += -MTd -Gm

--- a/build/platform-x86-common.mk

+++ b/build/platform-x86-common.mk

@@ -1,6 +1,6 @@

 CFLAGS_M32=-m32

 CFLAGS_M64=-m64

-ASM_INCLUDES = -Icodec/common/x86/

+ASM_INCLUDES = -I$(SRC_PATH)codec/common/x86/

 ifeq (, $(ENABLE64BIT))

 ifeq ($(ARCH), x86_64)

 ENABLE64BIT=Yes