Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update external submodules:

Browse source 
- opus to 1.1.1
- openh264 to 1.5
- libvpx to 1.5
This commit is contained in:
Simon Morlat 2016-01-04 12:21:32 +01:00
parent 4c1d5febb0
commit ca0341ae6c
7 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -303,13 +303,13 @@ openh264-install-headers:
mkdir -p $(OPENH264_SRC_DIR)/include/wels mkdir -p $(OPENH264_SRC_DIR)/include/wels
rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/. rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/.
copy-openh264-x86: openh264-patch openh264-install-headers copy-openh264-x86: openh264-install-headers
mkdir -p $(OPENH264_BUILD_DIR) mkdir -p $(OPENH264_BUILD_DIR)
mkdir -p $(OPENH264_BUILD_DIR_X86) mkdir -p $(OPENH264_BUILD_DIR_X86)
cd $(OPENH264_BUILD_DIR_X86) \ cd $(OPENH264_BUILD_DIR_X86) \
&& rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* . && rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* .
copy-openh264-arm: openh264-patch openh264-install-headers copy-openh264-arm: openh264-install-headers
mkdir -p $(OPENH264_BUILD_DIR) mkdir -p $(OPENH264_BUILD_DIR)
mkdir -p $(OPENH264_BUILD_DIR_ARM) mkdir -p $(OPENH264_BUILD_DIR_ARM)
cd $(OPENH264_BUILD_DIR_ARM) \ cd $(OPENH264_BUILD_DIR_ARM) \

7
patches/libvpx_configure_android_x86.patch
View file

@ -1,10 +1,10 @@
diff --git a/build/make/configure.sh b/build/make/configure.sh diff --git a/build/make/configure.sh b/build/make/configure.sh
index 25c9f80..336b006 100644 index c592b63..e4998d7 100644
--- a/build/make/configure.sh --- a/build/make/configure.sh
+++ b/build/make/configure.sh +++ b/build/make/configure.sh
@@ -1082,6 +1082,33 @@ EOF @@ -1132,6 +1132,32 @@ EOF
os2)
AS=${AS:-nasm} AS=${AS:-nasm}
add_ldflags -Zhigh-mem
;; ;;
+ android*) + android*)
+ SDK_PATH=${sdk_path} + SDK_PATH=${sdk_path}
@ -32,7 +32,6 @@ index 25c9f80..336b006 100644
+ +
+ soft_enable realtime_only + soft_enable realtime_only
+ ;; + ;;
+
esac esac
AS="${alt_as:-${AS:-auto}}" AS="${alt_as:-${AS:-auto}}"

16
submodules/externals/build/opus/Android.mk vendored
View file

@ -92,6 +92,22 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS += -include ../build/opus/config.h LOCAL_CFLAGS += -include ../build/opus/config.h
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += celt/arm/arm_celt_map.c \
celt/arm/armcpu.c
# celt/arm/celt_ne10_fft.c
# celt/arm/celt_ne10_mdct.c
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DOPUS_ARM_MAY_HAVE_NEON=1 -DOPUS_ARM_MAY_HAVE_NEON_INTR=1
# These two files were generated by hand using asm2gnu.pl script of opus.
LOCAL_SRC_FILES += ../build/opus/celt_pitch_xcorr_arm.S.neon \
celt/arm/celt_neon_intr.c.neon
endif
endif
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm

4
submodules/externals/build/opus/config.h vendored
View file

@ -138,3 +138,7 @@
# define _Restrict # define _Restrict
# define __restrict__ # define __restrict__
#endif #endif

2
submodules/externals/libvpx vendored

@ -1 +1 @@
Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd Subproject commit cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93

2
submodules/externals/openh264 vendored

@ -1 +1 @@
Subproject commit 3a75956fb2584cca84a95ba1fcbc72fa2c91f98d Subproject commit 2610ab183249aee91862d2ad065f61db89107b34

2
submodules/externals/opus vendored

@ -1 +1 @@
Subproject commit 4e8acd5ca305f385715a2c36642fdbc91503134f Subproject commit 1f22ae379bbcdfa376775db2b9407529fb1fa781