diff --git a/Makefile b/Makefile index 275325f34..d87636744 100644 --- a/Makefile +++ b/Makefile @@ -303,13 +303,13 @@ openh264-install-headers: mkdir -p $(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_X86) cd $(OPENH264_BUILD_DIR_X86) \ && 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_ARM) cd $(OPENH264_BUILD_DIR_ARM) \ diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch index 6c7f40e97..fa1004599 100644 --- a/patches/libvpx_configure_android_x86.patch +++ b/patches/libvpx_configure_android_x86.patch @@ -1,10 +1,10 @@ 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 +++ b/build/make/configure.sh -@@ -1082,6 +1082,33 @@ EOF - os2) +@@ -1132,6 +1132,32 @@ EOF AS=${AS:-nasm} + add_ldflags -Zhigh-mem ;; + android*) + SDK_PATH=${sdk_path} @@ -32,7 +32,6 @@ index 25c9f80..336b006 100644 + + soft_enable realtime_only + ;; -+ esac AS="${alt_as:-${AS:-auto}}" diff --git a/submodules/externals/build/opus/Android.mk b/submodules/externals/build/opus/Android.mk index 7e4718660..b1033fa8e 100644 --- a/submodules/externals/build/opus/Android.mk +++ b/submodules/externals/build/opus/Android.mk @@ -92,6 +92,22 @@ LOCAL_C_INCLUDES += \ 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 diff --git a/submodules/externals/build/opus/config.h b/submodules/externals/build/opus/config.h index 284c31e1e..3044bdee0 100644 --- a/submodules/externals/build/opus/config.h +++ b/submodules/externals/build/opus/config.h @@ -138,3 +138,7 @@ # define _Restrict # define __restrict__ #endif + + + + diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index c74bf6d88..cbecf57f3 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd +Subproject commit cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93 diff --git a/submodules/externals/openh264 b/submodules/externals/openh264 index 3a75956fb..2610ab183 160000 --- a/submodules/externals/openh264 +++ b/submodules/externals/openh264 @@ -1 +1 @@ -Subproject commit 3a75956fb2584cca84a95ba1fcbc72fa2c91f98d +Subproject commit 2610ab183249aee91862d2ad065f61db89107b34 diff --git a/submodules/externals/opus b/submodules/externals/opus index 4e8acd5ca..1f22ae379 160000 --- a/submodules/externals/opus +++ b/submodules/externals/opus @@ -1 +1 @@ -Subproject commit 4e8acd5ca305f385715a2c36642fdbc91503134f +Subproject commit 1f22ae379bbcdfa376775db2b9407529fb1fa781