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

refine the consts to kernel consts

Browse source
This commit is contained in:
winlin 2014-07-20 13:23:45 +08:00
parent baa20b2f31
commit a9f7f1ecfe
9 changed files with 88 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,7 @@ int SrsEdgeIngester::ingest()
// pithy print
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("<- "SRS_LOG_ID_EDGE_PLAY
srs_trace("<- "SRS_CONSTS_LOG_EDGE_PLAY
" time=%"PRId64", okbps=%d,%d,%d, ikbps=%d,%d,%d",
pithy_print.age(),
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),
@ -453,7 +453,7 @@ int SrsEdgeForwarder::cycle()
// pithy print
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("-> "SRS_LOG_ID_EDGE_PUBLISH
srs_trace("-> "SRS_CONSTS_LOG_EDGE_PUBLISH
" time=%"PRId64", msgs=%d, okbps=%d,%d,%d, ikbps=%d,%d,%d",
pithy_print.age(), count,
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),

2
trunk/src/app/srs_app_encoder.cpp
View file

@ -331,7 +331,7 @@ void SrsEncoder::encoder()
// reportable
if (pithy_print->can_print()) {
// TODO: FIXME: show more info.
srs_trace("-> "SRS_LOG_ID_ENCODER" time=%"PRId64", encoders=%d, input=%s",
srs_trace("-> "SRS_CONSTS_LOG_ENCODER" time=%"PRId64", encoders=%d, input=%s",
pithy_print->age(), (int)ffmpegs.size(), input_stream_name.c_str());
}
}

2
trunk/src/app/srs_app_forward.cpp
View file

@ -318,7 +318,7 @@ int SrsForwarder::forward()
// pithy print
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("-> "SRS_LOG_ID_FOWARDER
srs_trace("-> "SRS_CONSTS_LOG_FOWARDER
" time=%"PRId64", msgs=%d, okbps=%d,%d,%d, ikbps=%d,%d,%d",
pithy_print.age(), count,
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),

2
trunk/src/app/srs_app_hls.cpp
View file

@ -1521,7 +1521,7 @@ void SrsHls::hls_mux()
// the run time is not equals to stream time,
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/81#issuecomment-48100994
// it's ok.
srs_trace("-> "SRS_LOG_ID_HLS
srs_trace("-> "SRS_CONSTS_LOG_HLS
" time=%"PRId64", stream dts=%"PRId64"(%"PRId64"ms), sequence_no=%d",
pithy_print->age(), stream_dts, stream_dts / 90, muxer->sequence_no());
}

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

@ -350,7 +350,7 @@ void SrsIngester::ingester()
// reportable
if (pithy_print->can_print()) {
// TODO: FIXME: show more info.
srs_trace("-> "SRS_LOG_ID_INGESTER
srs_trace("-> "SRS_CONSTS_LOG_INGESTER
" time=%"PRId64", ingesters=%d", pithy_print->age(), (int)ingesters.size());
}
}

6
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -548,7 +548,7 @@ int SrsRtmpConn::playing(SrsSource* source)
// reportable
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("-> "SRS_LOG_ID_PLAY
srs_trace("-> "SRS_CONSTS_LOG_PLAY
" time=%"PRId64", msgs=%d, okbps=%d,%d,%d, ikbps=%d,%d,%d",
pithy_print.age(), count,
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),
@ -642,7 +642,7 @@ int SrsRtmpConn::fmle_publishing(SrsSource* source)
// reportable
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("<- "SRS_LOG_ID_CLIENT_PUBLISH
srs_trace("<- "SRS_CONSTS_LOG_CLIENT_PUBLISH
" time=%"PRId64", okbps=%d,%d,%d, ikbps=%d,%d,%d", pithy_print.age(),
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),
kbps->get_recv_kbps(), kbps->get_recv_kbps_30s(), kbps->get_recv_kbps_5m());
@ -723,7 +723,7 @@ int SrsRtmpConn::flash_publishing(SrsSource* source)
// reportable
if (pithy_print.can_print()) {
kbps->sample();
srs_trace("<- "SRS_LOG_ID_WEB_PUBLISH
srs_trace("<- "SRS_CONSTS_LOG_WEB_PUBLISH
" time=%"PRId64", okbps=%d,%d,%d, ikbps=%d,%d,%d",
pithy_print.age(),
kbps->get_send_kbps(), kbps->get_send_kbps_30s(), kbps->get_send_kbps_5m(),