diff --git a/trunk/3rdparty/freetype-2.4.0.zip b/trunk/3rdparty/freetype-2.4.0.zip deleted file mode 100644 index cb10ad775..000000000 Binary files a/trunk/3rdparty/freetype-2.4.0.zip and /dev/null differ diff --git a/trunk/3rdparty/readme.txt b/trunk/3rdparty/readme.txt index 5ac1c9eb0..315a7576d 100644 --- a/trunk/3rdparty/readme.txt +++ b/trunk/3rdparty/readme.txt @@ -35,9 +35,6 @@ gtest-1.6.0.zip gperftools-2.1.zip google性能分析和测试工具。 编译和使用参考压缩文件中的README和doc目录。 - -freetype-2.4.0 - ffmpeg用到的字体库，在加文字水印需要用到。 links: nginx: @@ -49,9 +46,6 @@ links: ffmpeg: http://ffmpeg.org/ http://ffmpeg.org/releases/ffmpeg-2.1.1.tar.gz - freetype: - http://www.freetype.org/index.html - http://download.savannah.gnu.org/releases/freetype/freetype-2.4.0.tar.bz2 x264: http://www.videolan.org/ ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20131129-2245-stable.tar.bz2 diff --git a/trunk/auto/build_ffmpeg.sh b/trunk/auto/build_ffmpeg.sh index 3aa347983..cc66eca4b 100755 --- a/trunk/auto/build_ffmpeg.sh +++ b/trunk/auto/build_ffmpeg.sh @@ -69,23 +69,6 @@ else ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi fi -# freetype-2.4.0 -# remark: we must ensure the pkg-config tool installed. -if [[ -f ${ff_release_dir}/lib/libfreetype.a ]]; then - echo "libfreetype is ok" -else - echo "build freetype-2.4.0" - cd $ff_current_dir && - rm -rf freetype-2.4.0 && unzip -q ${ff_src_dir}/freetype-2.4.0.zip && - cd freetype-2.4.0 && ./configure --prefix=${ff_release_dir} --enable-static && make ${SRS_JOBS} && make install - ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build freetype-2.4.0 failed"; exit 1; fi -fi -# add pc to pkg-config -pkg-config --exists --print-errors freetype2 >/dev/null 2>&1 -ret=$?; if [[ 0 -ne ${ret} ]]; then export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:$ff_current_dir/freetype-2.4.0/builds/unix; fi -pkg-config --exists --print-errors freetype2 >/dev/null 2>&1 -ret=$?; if [[ 0 -ne ${ret} ]]; then echo "oops... pkg-config cannot find the freetype, please report bug."; exit 1; fi - # x264 core.138 if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then echo "x264 is ok" @@ -122,7 +105,6 @@ else --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \ --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \ --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \ - --enable-libfreetype \ --enable-libx264 --enable-libmp3lame --enable-libaacplus --enable-libspeex \ --enable-pthreads --extra-libs=-lpthread \ --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 0685b48df..d72efd3bd 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -102,14 +102,6 @@ function Ubuntu_prepare() sudo apt-get install -y --force-yes zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi echo "install zlib1g-dev success" fi - - # for freetype2 - pkg-config --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then - echo "install pkg-config" - require_sudoer "sudo apt-get install -y --force-yes pkg-config" - sudo apt-get install -y --force-yes pkg-config; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi - echo "install pkg-config success" - fi fi # for arm, install the cross build tool chain. diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf index 2889dce9b..f036bb6b7 100644 --- a/trunk/conf/demo.conf +++ b/trunk/conf/demo.conf @@ -68,7 +68,8 @@ vhost demo.srs.com { engine ld { enabled on; vfilter { - vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontsize=30:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'; + i ./doc/srs-logo.png; + filter_complex 'overlay=10:10'; } vcodec libx264; vbitrate 300; @@ -135,7 +136,8 @@ vhost players { engine hls { enabled on; vfilter { - vf 'drawtext=text=SRS(SimpleRtmpServer):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'; + i ./doc/srs-logo.png; + filter_complex 'overlay=10:10'; } vcodec libx264; vbitrate 300; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index ee93964ca..be6fedcf6 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -513,36 +513,11 @@ vhost mirror.transcode.srs.com { } } } +# # the drawtext filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#drawtext-1 -vhost drawtext.transcode.srs.com { - transcode { - enabled on; - ffmpeg ./objs/ffmpeg/bin/ffmpeg; - engine drawtext { - enabled on; - vfilter { - vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf'; - } - vcodec libx264; - vbitrate 300; - vfps 20; - vwidth 768; - vheight 320; - vthreads 2; - vprofile baseline; - vpreset superfast; - vparams { - } - acodec libaacplus; - abitrate 45; - asample_rate 44100; - achannels 2; - aparams { - } - output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; - } - } -} +# remark: we remove the libfreetype which always cause build failed, you must add it manual if needed. +# +####################################################################################################### # the crop filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#crop vhost crop.transcode.srs.com { transcode { diff --git a/trunk/doc/FreeSerifBold.ttf b/trunk/doc/FreeSerifBold.ttf deleted file mode 100644 index 59a7a90f6..000000000 Binary files a/trunk/doc/FreeSerifBold.ttf and /dev/null differ diff --git a/trunk/doc/readme.txt b/trunk/doc/readme.txt index fd5287c14..4a0eb7fbd 100644 --- a/trunk/doc/readme.txt +++ b/trunk/doc/readme.txt @@ -4,11 +4,6 @@ ffmpeg-min.png source.flv avatar棰勫憡鐗囷紝400kbps銆 -FreeSerifBold.ttf - 瀛椾綋鏂囦欢锛宖fmpeg鐨刣rawtext filter闇瑕佷娇鐢ㄣ - 鍙傝冿細http://ffmpeg.org/ffmpeg-filters.html#drawtext-1 - 涓嬭浇鍦板潃锛歨ttp://www.fonts2u.com/free-serif.font - aac-iso-13818-7.pdf aac鏍囧噯锛宎ac鐨勭紪鐮佺瓑銆 diff --git a/trunk/doc/srs-logo.png b/trunk/doc/srs-logo.png new file mode 100644 index 000000000..275dd27e0 Binary files /dev/null and b/trunk/doc/srs-logo.png differ diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 25f00bdbf..4e26ed046 100644 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -336,7 +336,7 @@
rtmp://demo.srs.com/live/livestream_ld
- 瀵瑰師濮嬫祦鍔犱簡FFMPEG鏂囧瓧姘村嵃 + 瀵瑰師濮嬫祦鍔犱簡FFMPEG鍥剧墖姘村嵃
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index b5ad56703..7044d1060 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "138" +#define VERSION_REVISION "139" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS"