Skip to content

Commit

Permalink
doc: update
Browse files Browse the repository at this point in the history
  • Loading branch information
biezhihua committed Aug 23, 2019
1 parent 88d5a1f commit d424fdf
Show file tree
Hide file tree
Showing 8 changed files with 232 additions and 99 deletions.
70 changes: 65 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,73 @@

# FFmpegBuildTool

一款简洁、快速的FFmpeg编译构建工具。
A simple,fast FFmpeg build tool

# Build Platform

* MacOS(需要安装Python)
* Ubuntu(需要安装Python)

# Target Platform

* Android
* MacOS
* Ubuntu (Will Coming)
* Windows (Will Coming)
* iOS (Will Coming)

# Features

* FFmpeg: 4.1+
* OpenSSL: 1.1.1+
* Support NDK Version : **r13c** **r14b** **r15c** **r16b** **r17c** **r18b** **r19**
* Support Arch : armv7a/armv8a/x86/x86_64
* Support FFmpeg Separate compilation
* Support OpenSSL Separate compilation

NDK Download : https://developer.android.com/ndk/downloads/revision_history


# Set up the necessary environment

```
# add these lines to your ~/.bash_profile or ~/.profile
export ANDROID_SDK=<your sdk path>
export ANDROID_NDK=<your ndk path>
```

# How use

Android-OpenSSL: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/README_OPENSSL.md

Android-FFmpeg: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/README_FFMPEG.md

MacOS-FFmpeg: https://github.com/biezhihua/FFmpegBuildTool/blob/master/macos/README_FFMPEG.md

# Note

Part of the main structure from the IJKPlayer (https://github.com/bilibili/ijkplayer)


----------------

# FFmpegBuildTool

一款简洁、快速的全平台FFmpeg编译构建工具。

# 支持构建平台

* MacOS(需要安装Python)
* Ubuntu(需要安装Python)

# 支持目标平台

* Android
* MacOS
* Ubuntu (即将到来)
* Windows (即将到来)
* iOS (即将到来)

# 特性

* FFmpeg: 4.1+
Expand All @@ -31,9 +91,11 @@ export ANDROID_NDK=<your ndk path>

# 如何使用

Android-OpenSSL: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/OPENSSL_README.md
Android-OpenSSL: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/README_OPENSSL.md

Android-FFmpeg: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/FFMPEG_README.md
Android-FFmpeg: https://github.com/biezhihua/FFmpegBuildTool/blob/master/android/README_FFMPEG.md

MacOS-FFmpeg: https://github.com/biezhihua/FFmpegBuildTool/blob/master/macos/README_FFMPEG.md

# 注意

Expand All @@ -42,5 +104,3 @@ export ANDROID_NDK=<your ndk path>
# 引用

* https://stackoverflow.com/questions/2649334/difference-between-static-and-shared-libraries

# 预编译库下载
Empty file removed android/FFMPEG_README copy.md
Empty file.
35 changes: 35 additions & 0 deletions android/README_FFMPEG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

# Init Repository 初始化库

```
./init-ffmpeg.sh armv7a | all
```

# Clean Repository Cache 清理库缓存

```
./init-ffmpeg.sh clean
```

# Config Build Params 配置构建参数

```
./init-config min | default | mp4 or ...
```

# Build Library 构建库

```
./compile-ffmpeg.sh armv7a | all
```

# Check Output 查看输出结果

```
open ./product
```





8 changes: 4 additions & 4 deletions android/OPENSSL_README.md → android/README_OPENSSL.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@

# 初始化OpenSSL库
# Init Repository 初始化库

```
./init-openssl.sh armv7a | all
```

# 清理OpenSSL库缓存
# Clean Repository Cache 清理库缓存

```
./init-openssl.sh clean
```

# 构建静态库
# Build Library 构建库

```
./compile-openssl.sh armv7a | all
```

# 查看输出结果
# Check Output 查看输出结果

```
open ./product
Expand Down
5 changes: 2 additions & 3 deletions android/init-ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ NC='\033[0m' # No Color
TARGET=$1

UPSTREAM=https://github.com/FFmpeg/FFmpeg.git
VERSION=4.2
BRANCH=origin/release/$VERSION
LOCAL_REPO=../repository/ffmpeg-$VERSION
BRANCH=n4.2
LOCAL_REPO=../repository/ffmpeg

set -e

Expand Down
Loading

0 comments on commit d424fdf

Please sign in to comment.