loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 11:09:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistency fixes for FFmpeg extension instructions

Browse Source 
PiperOrigin-RevId: 303316976
This commit is contained in:
olly 2020-03-27 13:27:06 +00:00 committed by Oliver Woodman
parent c9f28086db
commit 3fd7d214cd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/ffmpeg/README.md
View File

@ -35,22 +35,22 @@ FFMPEG_EXT_PATH="$(pwd)/extensions/ffmpeg/src/main/jni"
NDK_PATH="<path to Android NDK>" NDK_PATH="<path to Android NDK>"
``` ```
* 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" HOST_PLATFORM="linux-x86_64"
``` ```
* Configure the formats supported by adapting the following variable if needed * Configure the decoders to include. See the [Supported formats][] page for
and by setting it. See the [Supported formats][] page for more details of the details of the available decoders, and which formats they support.
formats.
``` ```
ENABLED_DECODERS=(vorbis opus flac) ENABLED_DECODERS=(vorbis opus flac)
``` ```
* Fetch and build FFmpeg. For example, executing script `build_ffmpeg.sh` will * Fetch and build FFmpeg. Executing `build_ffmpeg.sh` will fetch and build
fetch and build FFmpeg release 4.2 for armeabi-v7a, arm64-v8a and x86: 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}" && \ cd "${FFMPEG_EXT_PATH}" && \
@ -63,7 +63,7 @@ cd "${FFMPEG_EXT_PATH}" && \
``` ```
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) ## ## Build instructions (Windows) ##

2
extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
View File

@ -85,7 +85,7 @@ make clean
--libdir=android-libs/x86_64 \ --libdir=android-libs/x86_64 \
--arch=x86_64 \ --arch=x86_64 \
--cpu=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" \ --nm="${TOOLCHAIN_PREFIX}/x86_64-linux-android-nm" \
--strip="${TOOLCHAIN_PREFIX}/x86_64-linux-android-strip" \ --strip="${TOOLCHAIN_PREFIX}/x86_64-linux-android-strip" \
--disable-asm \ --disable-asm \