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

8
trunk/src/app/srs_app_hls.hpp
View file

@ -56,6 +56,7 @@ class SrsTsAacJitter;
class SrsTsCache;
class SrsHlsSegment;
class SrsTsCache;
class SrsTsContext;
/**
* the handler for hls event.
@ -145,7 +146,7 @@ public:
// whether current segement is sequence header.
bool is_sequence_header;
public:
SrsHlsSegment(bool write_cache, bool write_file, SrsCodecAudio ac, SrsCodecVideo vc);
SrsHlsSegment(SrsTsContext* c, bool write_cache, bool write_file, SrsCodecAudio ac, SrsCodecVideo vc);
virtual ~SrsHlsSegment();
public:
/**
@ -229,6 +230,11 @@ private:
* @see https://github.com/winlinvip/simple-rtmp-server/issues/301
*/
SrsCodecAudio acodec;
/**
* the ts context, to keep cc continous between ts.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/375
*/
SrsTsContext* context;
public:
SrsHlsMuxer();
virtual ~SrsHlsMuxer();