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 branch '3.0release' of https://github.com/ossrs/srs into 3.0release

Browse source 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
This commit is contained in:
Harlan 2018-08-15 07:37:12 +08:00
commit 22c5af62cf
49 changed files with 4667 additions and 4248 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -789,7 +789,14 @@ srs_error_t SrsHlsMuxer::_refresh_m3u8(string m3u8_file)
ss << "#EXTINF:" << segment->duration() / 1000.0 << ", no desc" << SRS_CONSTS_LF;
// {file name}\n
ss << segment->uri << SRS_CONSTS_LF;
std::string seg_uri = segment->uri;
if (true) {
std::stringstream stemp;
stemp << (int)(segment->duration());
seg_uri = srs_string_replace(seg_uri, "[duration]", stemp.str());
}
//ss << segment->uri << SRS_CONSTS_LF;
ss << seg_uri << SRS_CONSTS_LF;
}
// write m3u8 to writer.