add some picture decoders.

Author: debugly

README.md

@@ -2,7 +2,7 @@
 
 **What's MRFFToolChain?**
 
-MRFFToolChain products was built for my FFmepg tutorial : https://github.com/debugly/FFmpegTutorial.
+MRFFToolChain products was built for my FFmepg tutorial : [https://github.com/debugly/FFmpegTutorial](https://github.com/debugly/FFmpegTutorial).
 
 At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libbluray、etc.
 
@@ -34,6 +34,7 @@ At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libblu
 │   ├── module-lite.sh
 │   └── module.sh -> module-full.sh
 ├── init-any.sh     #初始化源码仓库
+├── download-pre.sh #从github下载预编好的库
 ├── init-cfgs       #三方库的配置，包括库名，git仓库地址等信息
 │   ├── bluray
 │   ├── dav1d
@@ -53,6 +54,19 @@ At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libblu
     └── pull-repo-ref.sh
 ```
 
+## ## Download Pre Compiled
+
+可以跳过自己编译，直接从github上下载预编译好的库，节省时间！
+
+```bash
+#下载 iOS 平台的预编译库
+./download-pre.sh ios
+#下载 macOS 平台的预编译库
+./download-pre.sh macos
+#下载 ios 和 macOS 平台的预编译库
+./download-pre.sh all
+```
+
 ## Init Lib Repo
 
 脚本参数比较灵活，可根据需要搭配使用，常用方式举例：
@@ -132,17 +146,17 @@ cd macos
 
 如果 github 上的仓库克隆较慢，或者需要使用内网私有仓库，可在执行编译脚本前声明对应的环境变量！
 
-| 名称  | 默认仓库 | 使用镜像 |
-| --- | --- | --- |
-| FFmpeg | https://github.com/bilibili/FFmpeg.git | export GIT_FFMPEG_UPSTREAM=git@xx:yy/ffmpeg.git |
-| libYUV | https://github.com/lemenkov/libyuv.git | export GIT_FDK_UPSTREAM=git@xx:yy/libyuv.git |
-| OpenSSL | https://github.com/openssl/openssl.git | export GIT_OPUS_UPSTREAM=git@xx:yy/openssl.git |
-| Opus | [Xiph.Org / Opus · GitLab](https://gitlab.xiph.org/xiph/opus.git) | export GIT_OPUS_UPSTREAM=git@xx:yy/opusfile.git |
-| libbluray | [VideoLAN / libbluray · GitLab](https://code.videolan.org/videolan/libbluray.git) | export GIT_BLURAY_UPSTREAM=git@xx:yy/libbluray.git |
-| dav1d | https://code.videolan.org/videolan/dav1d.git | GIT_DAV1D_UPSTREAM=git@xx:yy/dav1d.git |
+| 名称        | 默认仓库                                             | 使用镜像                                               |
+| --------- | ------------------------------------------------ | -------------------------------------------------- |
+| FFmpeg    | https://github.com/bilibili/FFmpeg.git           | export GIT_FFMPEG_UPSTREAM=git@xx:yy/ffmpeg.git    |
+| libYUV    | https://github.com/lemenkov/libyuv.git           | export GIT_FDK_UPSTREAM=git@xx:yy/libyuv.git       |
+| OpenSSL   | https://github.com/openssl/openssl.git           | export GIT_OPUS_UPSTREAM=git@xx:yy/openssl.git     |
+| Opus      | https://gitlab.xiph.org/xiph/opus.git            | export GIT_OPUS_UPSTREAM=git@xx:yy/opusfile.git    |
+| libbluray | https://code.videolan.org/videolan/libbluray.git | export GIT_BLURAY_UPSTREAM=git@xx:yy/libbluray.git |
+| dav1d     | https://code.videolan.org/videolan/dav1d.git     | GIT_DAV1D_UPSTREAM=git@xx:yy/dav1d.git             |
 
 ## Platform Configuration
 
 1、如果不同的平台需要编译不同的库，只需要在 apple/compile-cfgs 目录下，建立 list_PLAT.txt 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下按照 list.txt 里声明的顺序编译各个库。
 
-2、ffmpeg 的配置需要分平台指定，只需要在 ffconfig 目录下创建 module_PLAT.sh 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下根据 module.sh 声明的配置进行编译 ffmpeg。
+2、ffmpeg 的配置需要分平台指定，只需要在 ffconfig 目录下创建 module_PLAT.sh 文件即可，PLAT 为对应的平台，比如 ios,macos 等；默认情况下根据 module.sh 声明的配置进行编译 ffmpeg。

download-pre.sh

@@ -0,0 +1,58 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2022 Matt Reach<[email protected]>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+PLAT=$1
+VER=$2
+
+if test -z $VER ;then
+    VER='V1.0-104be8c'
+fi
+
+set -e
+
+cd $(dirname "$0")
+c_dir="$PWD"
+
+function usage() {
+    echo " useage:"
+    echo " $0 [ios,macos,all]"
+}
+
+function download() {
+    local plat=$1
+    echo "===[download $plat $VER]===================="
+    mkdir -p build/pre
+    cd build/pre
+    echo "https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$plat-universal-$VER.zip"
+    curl -LO https://github.com/debugly/MRFFToolChainBuildShell/releases/download/$VER/$plat-universal-$VER.zip
+    mkdir -p ../product/$plat/universal
+    unzip -oq $plat-universal-$VER.zip -d ../product/$plat/universal
+    tree -L 2 ../product/$plat/universal
+    echo "===================================="
+    cd - >/dev/null
+}
+
+if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' ]]; then
+    download $PLAT
+elif [[ "$PLAT" == 'all' ]]; then
+    plats="ios macos"
+    for plat in $plats; do
+        download $plat
+    done
+else
+    usage
+fi

ffconfig/module-full.sh

@@ -305,6 +305,14 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=vp7"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=fic"
 # export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=ilbc"
 
+# picture
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=bmp"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=tiff"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=psd"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=webp"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=targa"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=pcx"
+
 # subtitle
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=ass"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=srt"

ffconfig/module-program.sh

@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+
+# module 文件是通过 source 的方式加载的，因此 $0 指的是调用方：./do-compile/ffmpeg.sh
+# BASH_SOURCE 是个栈，里面存了调用时文件列表
+# source 执行好处是在当前进程里执行的，因此所有上下文共用，声明的环境变量等在执行完文件后，仍旧有效
+# "副作用": 覆盖同名变量，$0 不是当前文件路径，修改了自己的工作目录就等于修改调用者的目录等。
+
+enter_path=$PWD
+dir=$(dirname ${BASH_SOURCE[0]}) && pwd
+source $dir/module-full.sh
+cd ${enter_path}
+
+# enable programs 
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-avdevice"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-avfilter"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-sdl2"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffmpeg"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffplay"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffprobe"