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 #381, support reap hls/ts by gop or not. 2.0.160.

Browse source
This commit is contained in:
winlin 2015-04-13 10:32:32 +08:00
parent d2c63d818b
commit dcac9c69d5
7 changed files with 65 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,6 +207,7 @@ private:
std::string hls_path;
std::string hls_ts_file;
bool hls_cleanup;
bool hls_wait_keyframe;
std::string m3u8_dir;
double hls_aof_ratio;
double hls_fragment;
@ -270,7 +271,7 @@ public:
virtual int update_config(SrsRequest* r, std::string entry_prefix,
std::string path, std::string m3u8_file, std::string ts_file,
double fragment, double window, bool ts_floor, double aof_ratio,
bool cleanup);
bool cleanup, bool wait_keyframe);
/**
* open a new segment(a new ts file),
* @param segment_start_dts use to calc the segment duration,
@ -283,6 +284,10 @@ public:
* that is whether the current segment duration>=(the segment in config)
*/
virtual bool is_segment_overflow();
/**
* whether wait keyframe to reap the ts.
*/
virtual bool wait_keyframe();
/**
* whether segment absolutely overflow, for pure audio to reap segment,
* that is whether the current segment duration>=2*(the segment in config)