From 3fd7d214cded8fc7fdad73d41791db452f330502 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 27 Mar 2020 13:27:06 +0000 Subject: [PATCH] Consistency fixes for FFmpeg extension instructions PiperOrigin-RevId: 303316976 --- extensions/ffmpeg/README.md | 14 +++++++------- extensions/ffmpeg/src/main/jni/build_ffmpeg.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md index 1b2db8f0f4..f6e3944572 100644 --- a/extensions/ffmpeg/README.md +++ b/extensions/ffmpeg/README.md @@ -35,22 +35,22 @@ FFMPEG_EXT_PATH="$(pwd)/extensions/ffmpeg/src/main/jni" NDK_PATH="" ``` -* Set up host platform ("darwin-x86_64" for Mac OS X): +* Set the host platform (use "darwin-x86_64" for Mac OS X): ``` HOST_PLATFORM="linux-x86_64" ``` -* Configure the formats supported by adapting the following variable if needed - and by setting it. See the [Supported formats][] page for more details of the - formats. +* Configure the decoders to include. See the [Supported formats][] page for + details of the available decoders, and which formats they support. ``` ENABLED_DECODERS=(vorbis opus flac) ``` -* Fetch and build FFmpeg. For example, executing script `build_ffmpeg.sh` will - fetch and build FFmpeg release 4.2 for armeabi-v7a, arm64-v8a and x86: +* Fetch and build FFmpeg. Executing `build_ffmpeg.sh` will fetch and build + FFmpeg 4.2 for `armeabi-v7a`, `arm64-v8a`, `x86` and `x86_64`. The script can + be edited if you need to build for different architectures. ``` cd "${FFMPEG_EXT_PATH}" && \ @@ -63,7 +63,7 @@ cd "${FFMPEG_EXT_PATH}" && \ ``` cd "${FFMPEG_EXT_PATH}" && \ -${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86" -j4 +${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" -j4 ``` ## Build instructions (Windows) ## diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh index b7d8f0eb7f..833ea189b2 100755 --- a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh +++ b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh @@ -85,7 +85,7 @@ make clean --libdir=android-libs/x86_64 \ --arch=x86_64 \ --cpu=x86_64 \ - --cross-prefix="${TOOLCHAIN_PREFIX}/x86_64-linux-android16-" \ + --cross-prefix="${TOOLCHAIN_PREFIX}/x86_64-linux-android21-" \ --nm="${TOOLCHAIN_PREFIX}/x86_64-linux-android-nm" \ --strip="${TOOLCHAIN_PREFIX}/x86_64-linux-android-strip" \ --disable-asm \