Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-11 10:40:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ff90278048ebd574813c375a4d2669b2b84cef0f
ff902780
1 parent
64727ce6
add speex1.2 to transcode flash encoder stream. change to 0.9.58
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
18 行增加
和
2 行删除
README.md
trunk/3rdparty/readme.txt
trunk/3rdparty/speex-1.2rc1.zip
trunk/auto/build_ffmpeg.sh
trunk/src/core/srs_core.hpp
README.md
查看文件 @
ff90278
...
...
@@ -222,6 +222,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
*
nginx v1.5.0: 139524 lines
<br/>
## History
*
v1.0, 2014-04-11, add speex1.2 to transcode flash encoder stream. change to 0.9.58
*
v1.0, 2014-04-10, support reload ingesters(add/remov/update). change to 0.9.57.
*
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.
*
v1.0, 2014-04-07, support
[
ingest
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest
)
file/stream/device.
...
...
trunk/3rdparty/readme.txt
100755 → 100644
查看文件 @
ff90278
...
...
@@ -18,6 +18,7 @@ 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.
remark: we use *.zip for all linux plantform.
...
...
@@ -72,4 +73,7 @@ links:
gperftools:
https://code.google.com/p/gperftools/
https://code.google.com/p/gperftools/downloads/list
speex:
http://www.speex.org/downloads/
http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
...
...
trunk/3rdparty/speex-1.2rc1.zip
0 → 100644
查看文件 @
ff90278
不能预览此文件类型
trunk/auto/build_ffmpeg.sh
查看文件 @
ff90278
...
...
@@ -58,6 +58,17 @@ else
ret
=
$?
;
if
[[
0 -ne
${
ret
}
]]
;
then
echo
"build lame-3.99.5 failed"
;
exit
1;
fi
fi
# speex-1.2rc1
if
[[
-f
${
ff_release_dir
}
/lib/libspeex.a
]]
;
then
echo
"libspeex is ok"
else
echo
"build speex-1.2rc1"
cd
$ff_current_dir
&&
rm -rf speex-1.2rc1
&&
unzip -q
${
ff_src_dir
}
/speex-1.2rc1.zip
&&
cd
speex-1.2rc1
&&
./configure --prefix
=
${
ff_release_dir
}
--enable-static
&&
make
${
SRS_JOBS
}
&&
make install
ret
=
$?
;
if
[[
0 -ne
${
ret
}
]]
;
then
echo
"build speex-1.2rc1 failed"
;
exit
1;
fi
fi
# x264 core.138
if
[[
-f
${
ff_release_dir
}
/lib/libx264.a
]]
;
then
echo
"x264 is ok"
...
...
@@ -93,7 +104,7 @@ else
--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-libx264 --enable-libmp3lame --enable-libaacplus
--enable-libspeex
\
--enable-pthreads --extra-libs
=
-lpthread
\
--enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers
&&
make
${
SRS_JOBS
}
&&
make install
...
...
trunk/src/core/srs_core.hpp
查看文件 @
ff90278
...
...
@@ -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 "5
7
"
#define VERSION_REVISION "5
8
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论