添加amr编解码库

Author: lzj

3.4.2/FFmpeg-iOS/include/libavutil/avconfig.h

@@ -2,5 +2,5 @@
 #ifndef AVUTIL_AVCONFIG_H
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
+#define AV_HAVE_FAST_UNALIGNED 0
 #endif /* AVUTIL_AVCONFIG_H */

3.4.2/build-ffmpeg-iOS.sh

@@ -21,17 +21,17 @@ rm -rf "$THIN"
 X264=`pwd`/x264-iOS         #H.264编码器
 #FDK_AAC=`pwd`/fdk-aac-ios   #AAC第三方解码库
 #FREETYPE=`pwd`/freetype-iOS  #字体引擎库
+#FREETYPE=`pwd`/freetype-iOS  #opencore-amr-0.1.5
+OPENCORE_AMR=`pwd`/opencore-amr-iOS
 
 CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-programs --disable-ffplay --disable-doc --enable-pic --enable-static --disable-shared --disable-asm"
 
-#剪裁参数
 CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-encoders --disable-decoders \
---disable-demuxers --disable-muxers --disable-parsers --disable-filters \
---enable-encoder=h264,aac,libx264,pcm_*,*jpeg* \
---enable-decoder=h264,aac,pcm_*,*jpeg* \
+--enable-demuxers --disable-muxers --disable-parsers --disable-filters \
+--enable-encoder=h264,aac,libx264,pcm_*,*jpeg*,libopencore_amrnb \
+--enable-decoder=h264,aac,pcm_*,*jpeg*,amrnb,amrwb \
 --enable-muxer=h264,aac,pcm_*,flv,mp4,avi \
---enable-demuxer=h264,aac,pcm_*,flv,mp4,avi \
---enable-parser=h264,aac,*jpeg* \
+--enable-parser=h264,aac,*jpeg*,mpeg* \
 --enable-avfilter --enable-filter=anull"
 
 if [ "$X264" ]
@@ -49,7 +49,13 @@ then
     CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-libfreetype"
 fi
 
-ARCHS="armv7 armv7s arm64 x86_64 i386"
+if [ "$OPENCORE_AMR" ]
+then
+    CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
+fi
+
+ARCHS="armv7 armv7s arm64 x86_64"
+#ARCHS="arm64"
 
 COMPILE="y"
 LIPO="y"
@@ -148,6 +154,11 @@ then
             CFLAGS="$CFLAGS -I$FREETYPE/include/freetype -I$CWD/libpng-iOS/include"
             LDFLAGS="$LDFLAGS -L$FREETYPE/lib -L$CWD/libpng-iOS/lib -lfreetype -lpng"
         fi
+        if [ "$OPENCORE_AMR" ]
+        then
+            CFLAGS="$CFLAGS -I$OPENCORE_AMR/include"
+            LDFLAGS="$LDFLAGS -L$OPENCORE_AMR/lib"
+        fi
 
 		TMPDIR=${TMPDIR/%\/} $CWD/$SOURCE/configure \
 		    --target-os=darwin \
@@ -183,4 +194,6 @@ then
 	cp -rf $THIN/$1/include $FAT
 fi
 
+rm -rf $SCRATCH
+rm -rf $THIN
 echo "iOS FFmpeg bulid success!"

3.4.2/build-opencore-amr-iOS.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+set -xe
+
+VERSION="0.1.5"
+LIBSRCNAME="opencore-amr"
+
+CURRENTPATH=`pwd`
+DEST="${CURRENTPATH}/${LIBSRCNAME}-iOS"
+mkdir -p $DEST
+
+DEVELOPER=`xcode-select -print-path`
+ARCHS="i386 x86_64 armv7 armv7s arm64"
+LIBS="libopencore-amrnb.a libopencore-amrwb.a"
+
+tar zxvf ${LIBSRCNAME}-${VERSION}.tar.gz -C "${CURRENTPATH}"
+cd "${CURRENTPATH}/${LIBSRCNAME}-${VERSION}"
+
+./configure
+
+for arch in $ARCHS; do
+    make clean
+    IOSMV=" -miphoneos-version-min=8.0"
+    case $arch in
+    arm*)
+        if [ $arch == "arm64" ]
+        then
+            IOSMV=" -miphoneos-version-min=8.0"
+        fi
+        echo "Building opencore-amr for iPhoneOS $arch ****************"
+        PATH=`xcodebuild -version -sdk iphoneos PlatformPath`"/Developer/usr/bin:$PATH" \
+        SDK=`xcodebuild -version -sdk iphoneos Path` \
+        CXX="xcrun --sdk iphoneos clang++ -arch $arch $IOSMV --sysroot=$SDK -isystem $SDK/usr/include  -fembed-bitcode" \
+        LDFLAGS="-Wl" \
+        ./configure \
+        --host=arm-apple-darwin \
+        --prefix=$DEST \
+        --disable-shared
+        ;;
+    *)
+        echo "Building opencore-amr for iPhoneSimulator $arch *****************"
+        PATH=`xcodebuild -version -sdk iphonesimulator PlatformPath`"/Developer/usr/bin:$PATH" \
+        CXX="xcrun --sdk iphonesimulator clang++ -arch $arch $IOSMV  -fembed-bitcode" \
+        ./configure \
+        --host=$arch \
+        --prefix=$DEST \
+        --disable-shared
+        ;;
+    esac
+    make -j3
+    make install
+    for i in $LIBS; do
+        mv $DEST/lib/$i $DEST/lib/$i.$arch
+    done
+done
+
+echo "Merge into universal binary."
+
+for i in $LIBS; do
+    input=""
+    for arch in $ARCHS; do
+        input="$input $DEST/lib/$i.$arch"
+    done
+    xcrun lipo -create -output $DEST/lib/$i $input
+done
+
+rm $DEST/lib/libopencore-amrnb.a.*
+rm $DEST/lib/libopencore-amrnb.la
+rm $DEST/lib/libopencore-amrwb.a.*
+rm $DEST/lib/libopencore-amrwb.la
+rm -rf $DEST/lib/pkgconfig

3.4.2/fat-faac/include/faac.h

@@ -0,0 +1,2 @@
+*.pnm -diff -text
+tests/ref/fate/sub-scc eol=crlf

3.4.2/fat-faac/include/faaccfg.h

@@ -0,0 +1,26 @@
+language: c
+sudo: false
+os:
+  - linux
+  - osx
+addons:
+  apt:
+    packages:
+      - nasm
+      - diffutils
+compiler:
+  - clang
+  - gcc
+cache:
+  directories:
+    - ffmpeg-samples
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
+script:
+  - mkdir -p ffmpeg-samples
+  - ./configure --samples=ffmpeg-samples --cc=$CC
+  - make -j 8
+  - make fate-rsync
+  - make check -j 8

3.4.2/ffmpeg-3.4.2/.gitattributes

@@ -0,0 +1,4 @@
+# Note to Github users
+Patches should be submitted to the [ffmpeg-devel mailing list](https://ffmpeg.org/mailman/listinfo/ffmpeg-devel) using `git format-patch` or `git send-email`. Github pull requests should be avoided because they are not part of our review process and **will be ignored**.
+
+See [https://ffmpeg.org/developer.html#Contributing](https://ffmpeg.org/developer.html#Contributing) for more information.