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_encoder.cpp
View file

@ -113,7 +113,7 @@ int SrsEncoder::cycle()
// pithy print
encoder();
pithy_print->elapse(SRS_RTMP_ENCODER_SLEEP_US / 1000);
pithy_print->elapse();
return ret;
}
@ -326,7 +326,7 @@ void SrsEncoder::encoder()
if (pithy_print->can_print()) {
// TODO: FIXME: show more info.
srs_trace("-> time=%"PRId64", encoders=%d, input=%s",
pithy_print->get_age(), (int)ffmpegs.size(), input_stream_name.c_str());
pithy_print->age(), (int)ffmpegs.size(), input_stream_name.c_str());
}
}