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
2013-12-01 13:04:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
18028ad4cbb2bf3259d9f48cd6ec8ca0d28ba423
18028ad4
1 parent
bf18a3ac
update readme
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
1 行删除
README.md
trunk/src/core/srs_core_encoder.cpp
trunk/src/core/srs_core_forward.cpp
README.md
查看文件 @
18028ad
...
...
@@ -36,7 +36,8 @@ FMS URL: rtmp://127.0.0.1:1935/live
Stream: livestream
For example, use ffmpeg to publish:
for((;;)); do
\
./objs/ffmpeg/bin/ffmpeg -re -i ./doc/source.200kbps.768x320.flv -vcodec copy -acodec copy
\
./objs/ffmpeg/bin/ffmpeg -re -i ./doc/source.200kbps.768x320.flv
\
-vcodec copy -acodec copy
\
-f flv -y rtmp://127.0.0.1:1935/live/livestream;
\
sleep 1;
\
done
...
...
trunk/src/core/srs_core_encoder.cpp
100644 → 100755
查看文件 @
18028ad
...
...
@@ -109,6 +109,7 @@ int SrsFFMPEG::initialize(std::string vhost, std::string port, std::string app,
if
(
output
.
length
()
>
input
.
length
())
{
tail
=
output
.
substr
(
input
.
length
());
}
// TODO: better dead loop check.
// if input also endwiths the tail, loop detected.
if
(
!
tail
.
empty
()
&&
input
.
rfind
(
tail
)
==
input
.
length
()
-
tail
.
length
())
{
ret
=
ERROR_ENCODER_LOOP
;
...
...
trunk/src/core/srs_core_forward.cpp
100644 → 100755
查看文件 @
18028ad
...
...
@@ -77,6 +77,8 @@ int SrsForwarder::on_publish(std::string vhost, std::string _app, std::string st
server
=
forward_server
;
port
=
1935
;
// TODO: dead loop check.
size_t
pos
=
forward_server
.
find
(
":"
);
if
(
pos
!=
std
::
string
::
npos
)
{
port
=
::
atoi
(
forward_server
.
substr
(
pos
+
1
).
c_str
());
...
...
请
注册
或
登录
后发表评论