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

update pithy-print to 10s. refine log

Browse source
This commit is contained in:
winlin 2014-05-04 10:45:13 +08:00
parent 243a2eabf5
commit a4410a4fa9
10 changed files with 68 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -517,7 +517,7 @@ SrsHlsAacJitter::SrsHlsAacJitter()
SrsHlsMuxer::SrsHlsMuxer()
{
hls_fragment = hls_window = 0;
file_index = 0;
_sequence_no = 0;
current = NULL;
}
@ -533,6 +533,11 @@ SrsHlsMuxer::~SrsHlsMuxer()
srs_freep(current);
}
int SrsHlsMuxer::sequence_no()
{
return _sequence_no;
}
int SrsHlsMuxer::update_config(
string _app, string _stream, string path, int fragment, int window
) {
@ -567,7 +572,7 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
// new segment.
current = new SrsHlsSegment();
current->sequence_no = file_index++;
current->sequence_no = _sequence_no++;
current->segment_start_dts = segment_start_dts;
// generate filename.
@ -690,7 +695,7 @@ int SrsHlsMuxer::segment_close(string log_desc)
if (current->duration * 1000 >= SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS) {
segments.push_back(current);
srs_trace("%s reap ts segment, sequence_no=%d, uri=%s, duration=%.2f, start=%"PRId64"",
srs_info("%s reap ts segment, sequence_no=%d, uri=%s, duration=%.2f, start=%"PRId64"",
log_desc.c_str(), current->sequence_no, current->uri.c_str(), current->duration,
current->segment_start_dts);
@ -709,7 +714,7 @@ int SrsHlsMuxer::segment_close(string log_desc)
}
} else {
// reuse current segment index.
file_index--;
_sequence_no--;
srs_trace("%s drop ts segment, sequence_no=%d, uri=%s, duration=%.2f, start=%"PRId64"",
log_desc.c_str(), current->sequence_no, current->uri.c_str(), current->duration,
@ -1470,7 +1475,9 @@ void SrsHls::hls_mux()
{
// reportable
if (pithy_print->can_print()) {
srs_trace("-> time=%"PRId64"", pithy_print->age());
srs_trace("-> "SRS_LOG_ID_HLS
" time=%"PRId64", dts=%"PRId64", sequence_no=%d",
pithy_print->age(), stream_dts, muxer->sequence_no());
}
pithy_print->elapse();