winlin

add speex1.2 to transcode flash encoder stream. change to 0.9.58

@@ -222,6 +222,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw @@ -222,6 +222,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
222 * nginx v1.5.0: 139524 lines <br/> 222 * nginx v1.5.0: 139524 lines <br/>
223 223
224 ## History 224 ## History
  225 +* v1.0, 2014-04-11, add speex1.2 to transcode flash encoder stream. change to 0.9.58
225 * v1.0, 2014-04-10, support reload ingesters(add/remov/update). change to 0.9.57. 226 * v1.0, 2014-04-10, support reload ingesters(add/remov/update). change to 0.9.57.
226 * v1.0, 2014-04-07, [1.0 mainline(0.9.55)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline) released. 30000 lines. 227 * v1.0, 2014-04-07, [1.0 mainline(0.9.55)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline) released. 30000 lines.
227 * v1.0, 2014-04-07, support [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest) file/stream/device. 228 * v1.0, 2014-04-07, support [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest) file/stream/device.
@@ -18,6 +18,7 @@ yasm-1.2.0.tar.gz @@ -18,6 +18,7 @@ yasm-1.2.0.tar.gz
18 lame-3.99.5.tar.gz 18 lame-3.99.5.tar.gz
19 libaacplus-2.0.2.tar.gz 19 libaacplus-2.0.2.tar.gz
20 libaacplus-patch-26410-800.zip (26410-800.zip) 20 libaacplus-patch-26410-800.zip (26410-800.zip)
  21 +speex-1.2rc1.zip
21 x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) 22 x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
22 for srs to support live stream transcoding. 23 for srs to support live stream transcoding.
23 remark: we use *.zip for all linux plantform. 24 remark: we use *.zip for all linux plantform.
@@ -72,4 +73,7 @@ links: @@ -72,4 +73,7 @@ links:
72 gperftools: 73 gperftools:
73 https://code.google.com/p/gperftools/ 74 https://code.google.com/p/gperftools/
74 https://code.google.com/p/gperftools/downloads/list 75 https://code.google.com/p/gperftools/downloads/list
  76 + speex:
  77 + http://www.speex.org/downloads/
  78 + http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
75 79
不能预览此文件类型
@@ -58,6 +58,17 @@ else @@ -58,6 +58,17 @@ else
58 ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build lame-3.99.5 failed"; exit 1; fi 58 ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build lame-3.99.5 failed"; exit 1; fi
59 fi 59 fi
60 60
  61 +# speex-1.2rc1
  62 +if [[ -f ${ff_release_dir}/lib/libspeex.a ]]; then
  63 + echo "libspeex is ok"
  64 +else
  65 + echo "build speex-1.2rc1"
  66 + cd $ff_current_dir &&
  67 + rm -rf speex-1.2rc1 && unzip -q ${ff_src_dir}/speex-1.2rc1.zip &&
  68 + cd speex-1.2rc1 && ./configure --prefix=${ff_release_dir} --enable-static && make ${SRS_JOBS} && make install
  69 + ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build speex-1.2rc1 failed"; exit 1; fi
  70 +fi
  71 +
61 # x264 core.138 72 # x264 core.138
62 if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then 73 if [[ -f ${ff_release_dir}/lib/libx264.a ]]; then
63 echo "x264 is ok" 74 echo "x264 is ok"
@@ -93,7 +104,7 @@ else @@ -93,7 +104,7 @@ else
93 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \ 104 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
94 --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \ 105 --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \
95 --enable-libfreetype \ 106 --enable-libfreetype \
96 - --enable-libx264 --enable-libmp3lame --enable-libaacplus \ 107 + --enable-libx264 --enable-libmp3lame --enable-libaacplus --enable-libspeex \
97 --enable-pthreads --extra-libs=-lpthread \ 108 --enable-pthreads --extra-libs=-lpthread \
98 --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && 109 --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers &&
99 make ${SRS_JOBS} && make install 110 make ${SRS_JOBS} && make install
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "57" 34 +#define VERSION_REVISION "58"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"