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

edge support play and ingest origin stream. change to 0.9.77

Browse source
This commit is contained in:
winlin 2014-04-26 21:41:18 +08:00
parent acba4cfdc6
commit 2bcaeccc51
17 changed files with 406 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_ingest.cpp
View file

@ -188,7 +188,7 @@ int SrsIngester::cycle()
// pithy print
ingester();
pithy_print->elapse(SRS_AUTO_INGESTER_SLEEP_US / 1000);
pithy_print->elapse();
return ret;
}
@ -350,7 +350,7 @@ void SrsIngester::ingester()
}
// TODO: FIXME: show more info.
srs_trace("-> time=%"PRId64", ingesters=%d", pithy_print->get_age(), (int)ingesters.size());
srs_trace("-> time=%"PRId64", ingesters=%d", pithy_print->age(), (int)ingesters.size());
}
int SrsIngester::on_reload_vhost_added(string vhost)