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

fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.

Browse source
This commit is contained in:
winlin 2015-04-08 16:52:43 +08:00
parent 29ac4c724b
commit 546be09219
6 changed files with 72 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,14 +138,14 @@ string SrsHlsCacheWriter::cache()
return data;
}
SrsHlsSegment::SrsHlsSegment(bool write_cache, bool write_file, SrsCodecAudio ac, SrsCodecVideo vc)
SrsHlsSegment::SrsHlsSegment(SrsTsContext* c, bool write_cache, bool write_file, SrsCodecAudio ac, SrsCodecVideo vc)
{
duration = 0;
sequence_no = 0;
segment_start_dts = 0;
is_sequence_header = false;
writer = new SrsHlsCacheWriter(write_cache, write_file);
muxer = new SrsTSMuxer(writer, ac, vc);
muxer = new SrsTSMuxer(writer, c, ac, vc);
}
SrsHlsSegment::~SrsHlsSegment()
@ -236,6 +236,7 @@ SrsHlsMuxer::SrsHlsMuxer()
should_write_cache = false;
should_write_file = true;
async = new SrsDvrAsyncCallThread();
context = new SrsTsContext();
}
SrsHlsMuxer::~SrsHlsMuxer()
@ -250,6 +251,7 @@ SrsHlsMuxer::~SrsHlsMuxer()
srs_freep(current);
srs_freep(req);
srs_freep(async);
srs_freep(context);
}
int SrsHlsMuxer::sequence_no()
@ -269,11 +271,21 @@ double SrsHlsMuxer::duration()
double SrsHlsMuxer::deviation()
{
// no floor, no deviation.
if (!hls_ts_floor) {
return 0;
}
return hls_fragment_deviation;
}
int SrsHlsMuxer::absolute_deviation()
{
// no floor, no deviation.
if (!hls_ts_floor) {
return 0;
}
// accept the floor ts for the first piece.
int64_t floor_ts = (int64_t)(srs_get_system_time_ms() / (1000 * hls_fragment));
return (int)(accept_floor_ts - (floor_ts - 1));
@ -391,7 +403,7 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
}
// new segment.
current = new SrsHlsSegment(should_write_cache, should_write_file, default_acodec, default_vcodec);
current = new SrsHlsSegment(context, should_write_cache, should_write_file, default_acodec, default_vcodec);
current->sequence_no = _sequence_no++;
current->segment_start_dts = segment_start_dts;