external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2.

Browse source
This commit is contained in:
winlin 2015-12-26 12:17:51 +08:00
commit 7ae2c6bf50
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_source.cpp
View file

@ -419,9 +419,10 @@ ISrsWakable::~ISrsWakable()
{
}
SrsConsumer::SrsConsumer(SrsSource* _source)
SrsConsumer::SrsConsumer(SrsSource* s, SrsConnection* c)
{
source = _source;
source = s;
conn = c;
paused = false;
jitter = new SrsRtmpJitter();
queue = new SrsMessageQueue();
@ -2157,11 +2158,11 @@ void SrsSource::on_unpublish()
handler->on_unpublish(this, req);
}
int SrsSource::create_consumer(SrsConsumer*& consumer, bool ds, bool dm, bool dg)
int SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool ds, bool dm, bool dg)
{
int ret = ERROR_SUCCESS;
consumer = new SrsConsumer(this);
consumer = new SrsConsumer(this, conn);
consumers.push_back(consumer);
double queue_size = _srs_config->get_queue_length(req->vhost);