sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increase supported libflac version to 1.3.2

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215214894
This commit is contained in:
eguven 2018-10-01 08:05:01 -07:00 committed by Oliver Woodman
parent 4921595041
commit b59781b3eb
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/flac/README.md
View file

@ -28,18 +28,19 @@ EXOPLAYER_ROOT="$(pwd)"
FLAC_EXT_PATH="${EXOPLAYER_ROOT}/extensions/flac/src/main" FLAC_EXT_PATH="${EXOPLAYER_ROOT}/extensions/flac/src/main"
``` ```
* Download the [Android NDK][] and set its location in an environment variable: * Download the [Android NDK][] (version <= 17c) and set its location in an
environment variable:
``` ```
NDK_PATH="<path to Android NDK>" NDK_PATH="<path to Android NDK>"
``` ```
* Download and extract flac-1.3.1 as "${FLAC_EXT_PATH}/jni/flac" folder: * Download and extract flac-1.3.2 as "${FLAC_EXT_PATH}/jni/flac" folder:
``` ```
cd "${FLAC_EXT_PATH}/jni" && \ cd "${FLAC_EXT_PATH}/jni" && \
curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.1.tar.xz | tar xJ && \ curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz | tar xJ && \
mv flac-1.3.1 flac mv flac-1.3.2 flac
``` ```
* Build the JNI native libraries from the command line: * Build the JNI native libraries from the command line:

4
extensions/flac/src/main/jni/Android.mk
View file

@ -30,9 +30,9 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/flac/src/libFLAC/include $(LOCAL_PATH)/flac/src/libFLAC/include
LOCAL_SRC_FILES := $(FLAC_SOURCES) LOCAL_SRC_FILES := $(FLAC_SOURCES)
LOCAL_CFLAGS += '-DVERSION="1.3.1"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY -DFLAC__NO_ASM LOCAL_CFLAGS += '-DPACKAGE_VERSION="1.3.2"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC -DHAVE_SYS_PARAM_H LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC -DHAVE_SYS_PARAM_H
LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions -DFLAC__NO_ASM '-DFLAC__HAS_OGG=0'
LOCAL_LDLIBS := -llog -lz -lm LOCAL_LDLIBS := -llog -lz -lm
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
extensions/flac/src/main/jni/Application.mk
View file

@ -17,4 +17,4 @@
APP_OPTIM := release APP_OPTIM := release
APP_STL := gnustl_static APP_STL := gnustl_static
APP_CPPFLAGS := -frtti APP_CPPFLAGS := -frtti
APP_PLATFORM := android-9 APP_PLATFORM := android-14