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-15 19:38:39 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ce4928cef64123711aa1d1f49016e013a9df840d
ce4928ce
1 parent
5836ffd2
support set the live queue length(in seconds), drop when full.
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
10 行增加
和
7 行删除
README.md
trunk/conf/srs.conf
trunk/src/core/srs_core_forward.cpp
trunk/src/core/srs_core_source.cpp
README.md
查看文件 @
ce4928c
...
...
@@ -212,7 +212,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
*
nginx v1.5.0: 139524 lines
<br/>
### History
*
v0.9, 2013-12-15,
drop the old whole gop when live message queue
full.
*
v0.9, 2013-12-15,
support set the live queue length(in seconds), drop when
full.
*
v0.9, 2013-12-15, fix the forwarder reconnect bug, feed it the sequence header.
*
v0.9, 2013-12-15, support reload the hls/forwarder/transcoder.
*
v0.9, 2013-12-14, refine the thread model for the retry threads.
...
...
trunk/conf/srs.conf
查看文件 @
ce4928c
...
...
@@ -94,7 +94,7 @@ vhost dev {
enabled
on
;
gop_cache
on
;
queue_length
10
;
#
forward 127.0.0.1:19350;
forward
127
.
0
.
0
.
1
:
19350
;
hls
{
enabled
off
;
hls_path
./
objs
/
nginx
/
html
;
...
...
trunk/src/core/srs_core_forward.cpp
查看文件 @
ce4928c
...
...
@@ -36,6 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_rtmp.hpp>
#include <srs_core_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
#define SRS_PULSE_TIMEOUT_MS 100
#define SRS_FORWARDER_SLEEP_MS 2000
...
...
@@ -138,7 +139,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
jitter
->
correct
(
metadata
,
0
,
0
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
m
sg
);
srs_freep
(
m
etadata
);
return
ret
;
}
...
...
@@ -308,7 +309,7 @@ int SrsForwarder::forward()
// forward all messages.
int
count
=
0
;
SrsSharedPtrMessage
**
msgs
=
NULL
;
if
((
ret
=
queue
->
get_packets
(
0
,
&
msgs
,
count
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
queue
->
get_packets
(
0
,
msgs
,
count
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"get message to forward failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
trunk/src/core/srs_core_source.cpp
查看文件 @
ce4928c
...
...
@@ -900,11 +900,10 @@ void SrsSource::on_unpublish()
{
int
ret
=
ERROR_SUCCESS
;
double
queue_size
=
config
->
get_queue_length
(
req
->
vhost
);
consumer
=
new
SrsConsumer
(
this
);
consumers
.
push_back
(
consumer
);
double
queue_size
=
config
->
get_queue_length
(
req
->
vhost
);
consumer
->
set_queue_size
(
queue_size
);
if
(
cache_metadata
&&
(
ret
=
consumer
->
enqueue
(
cache_metadata
->
copy
(),
sample_rate
,
frame_rate
))
!=
ERROR_SUCCESS
)
{
...
...
@@ -960,6 +959,9 @@ int SrsSource::create_forwarders()
SrsForwarder
*
forwarder
=
new
SrsForwarder
(
this
);
forwarders
.
push_back
(
forwarder
);
double
queue_size
=
config
->
get_queue_length
(
req
->
vhost
);
forwarder
->
set_queue_size
(
queue_size
);
if
((
ret
=
forwarder
->
on_publish
(
req
,
forward_server
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"start forwarder failed. "
"vhost=%s, app=%s, stream=%s, forward-to=%s"
,
...
...
请
注册
或
登录
后发表评论