mirror of
https://github.com/ossrs/srs.git
synced 2025-02-15 04:42:04 +00:00
Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
This commit is contained in:
winlin
commit
ee30e6bb1f
8 changed files with 20 additions and 50 deletions
BIN
trunk/3rdparty/libaacplus-2.0.2.zip
vendored
BIN
trunk/3rdparty/libaacplus-2.0.2.zip
vendored
Binary file not shown.
BIN
trunk/3rdparty/libaacplus-patch-26410-800.zip
vendored
BIN
trunk/3rdparty/libaacplus-patch-26410-800.zip
vendored
Binary file not shown.
8
trunk/3rdparty/readme.txt
vendored
8
trunk/3rdparty/readme.txt
vendored
|
|
@ -16,8 +16,6 @@ CherryPy-3.2.4.zip
|
|||
ffmpeg-2.1.1.tar.gz
|
||||
yasm-1.2.0.tar.gz
|
||||
lame-3.99.5.tar.gz
|
||||
libaacplus-2.0.2.tar.gz
|
||||
libaacplus-patch-26410-800.zip (26410-800.zip)
|
||||
speex-1.2rc1.zip
|
||||
x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
|
||||
for srs to support live stream transcoding.
|
||||
|
|
@ -55,12 +53,6 @@ links:
|
|||
lame:
|
||||
http://sourceforge.net/projects/lame/
|
||||
http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
|
||||
aacplus:
|
||||
http://217.20.164.161/~tipok/aacplus/
|
||||
http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz
|
||||
aacplus-patch:
|
||||
http://www.3gpp.org/DynaReport/26410.htm
|
||||
http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
|
||||
yasm:
|
||||
http://yasm.tortall.net/
|
||||
http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ff_src_dir="../../3rdparty"
|
||||
|
||||
# the jobs to make ffmpeg
|
||||
if [[ "" -eq SRS_JOBS ]]; then
|
||||
if [[ "" == $SRS_JOBS ]]; then
|
||||
export SRS_JOBS="--jobs=1"
|
||||
fi
|
||||
|
||||
|
|
@ -38,9 +38,6 @@ fi
|
|||
# ffmpeg can specifies the yasm path when configure it.
|
||||
export PATH=${PATH}:${ff_release_dir}/bin
|
||||
|
||||
# the aac command for ffmepg.
|
||||
AAC_FOR_FFMPEG="--enable-libfdk-aac"
|
||||
|
||||
# libfdk-aac
|
||||
if [[ -f ${ff_release_dir}/lib/libfdk-aac.a ]]; then
|
||||
echo "libfdk_aac is ok"
|
||||
|
|
@ -52,24 +49,6 @@ else
|
|||
ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build fdk-aac-0.1.3 failed"; exit 1; fi
|
||||
fi
|
||||
|
||||
# libaacplus
|
||||
if [ $UBUNTU14 = NO ]; then
|
||||
AAC_FOR_FFMPEG="$AAC_FOR_FFMPEG --enable-libaacplus"
|
||||
|
||||
if [[ -f ${ff_release_dir}/lib/libaacplus.a ]]; then
|
||||
echo "libaacplus is ok"
|
||||
else
|
||||
echo "build libaacplus-2.0.2"
|
||||
cd $ff_current_dir &&
|
||||
rm -rf libaacplus-2.0.2 && unzip -q ${ff_src_dir}/libaacplus-2.0.2.zip &&
|
||||
cd libaacplus-2.0.2 && cp ../${ff_src_dir}/libaacplus-patch-26410-800.zip src/26410-800.zip &&
|
||||
bash autogen.sh && ./configure --prefix=${ff_release_dir} --enable-static && make && make install
|
||||
ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build libaacplus-2.0.2 failed"; exit 1; fi
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "aac for ffmepg: $AAC_FOR_FFMPEG"
|
||||
|
||||
# lame-3.99
|
||||
if [[ -f ${ff_release_dir}/lib/libmp3lame.a ]]; then
|
||||
echo "libmp3lame is ok"
|
||||
|
|
@ -128,7 +107,7 @@ 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-libx264 --enable-libmp3lame $AAC_FOR_FFMPEG --enable-libspeex \
|
||||
--enable-libx264 --enable-libmp3lame --enable-libfdk-aac --enable-libspeex \
|
||||
--enable-pthreads --extra-libs=-lpthread \
|
||||
--enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers &&
|
||||
make ${SRS_JOBS} && make install
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ vhost demo.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -105,7 +105,7 @@ vhost demo.srs.com {
|
|||
vpreset fast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 40;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -151,7 +151,7 @@ vhost players {
|
|||
vparams {
|
||||
g 100;
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 30;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ vhost __defaultVhost__ {
|
|||
vpreset medium;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 70;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
|
|||
|
|
@ -788,12 +788,11 @@ vhost example.transcode.srs.com {
|
|||
refs 10;
|
||||
}
|
||||
# audio encoder name. can be:
|
||||
# libaacplus: use aac(libaacplus) audio encoder.
|
||||
# libfdk_aac: use aac(libfdk_aac) audio encoder.
|
||||
# copy: donot encoder the audio stream, copy it.
|
||||
# an: disable audio output.
|
||||
acodec libaacplus;
|
||||
# audio bitrate, in kbps. [16, 72] for libaacplus.
|
||||
acodec libfdk_aac;
|
||||
# audio bitrate, in kbps. [16, 72] for libfdk_aac.
|
||||
abitrate 70;
|
||||
# audio sample rate. for flv/rtmp, it must be:
|
||||
# 44100,22050,11025,5512
|
||||
|
|
@ -841,7 +840,7 @@ vhost mirror.transcode.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -874,7 +873,7 @@ vhost crop.transcode.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -905,7 +904,7 @@ vhost logo.transcode.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -925,7 +924,7 @@ vhost audio.transcode.srs.com {
|
|||
engine acodec {
|
||||
enabled on;
|
||||
vcodec copy;
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -944,7 +943,7 @@ vhost vn.transcode.srs.com {
|
|||
engine vn {
|
||||
enabled on;
|
||||
vcodec vn;
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -996,7 +995,7 @@ vhost all.transcode.srs.com {
|
|||
bf 3;
|
||||
refs 10;
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 70;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -1018,7 +1017,7 @@ vhost all.transcode.srs.com {
|
|||
vpreset medium;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 70;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -1038,7 +1037,7 @@ vhost all.transcode.srs.com {
|
|||
vpreset fast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 60;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -1058,7 +1057,7 @@ vhost all.transcode.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -1069,7 +1068,7 @@ vhost all.transcode.srs.com {
|
|||
engine vcopy {
|
||||
enabled on;
|
||||
vcodec copy;
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
@ -1117,7 +1116,7 @@ vhost ffempty.transcode.srs.com {
|
|||
vpreset superfast;
|
||||
vparams {
|
||||
}
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ vhost __defaultVhost__ {
|
|||
engine ff {
|
||||
enabled on;
|
||||
vcodec copy;
|
||||
acodec libaacplus;
|
||||
acodec libfdk_aac;
|
||||
abitrate 45;
|
||||
asample_rate 44100;
|
||||
achannels 2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue