hls切片以系统时间戳为准

src/MediaFile/HlsMaker.cpp

@@ -86,10 +86,10 @@ void HlsMaker::delOldFile() {
     }
     }
 }
 }
 
 
-void HlsMaker::addNewFile(uint32_t timestamp) {
-    int stampInc = timestamp - _stamp_last;
+void HlsMaker::addNewFile(uint32_t) {
+    int stampInc = _ticker.elapsedTime();
     if (stampInc >= _seg_duration * 1000) {
     if (stampInc >= _seg_duration * 1000) {
-        _stamp_last = timestamp;
+        _ticker.resetTime();
         auto file_name = onOpenFile(_file_index);
         auto file_name = onOpenFile(_file_index);
         if (_file_index++ > 0) {
         if (_file_index++ > 0) {
             _seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name));
             _seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name));

src/MediaFile/HlsMaker.h

@@ -86,11 +86,10 @@ private:
     void addNewFile(uint32_t timestamp);
     void addNewFile(uint32_t timestamp);
     void makeIndexFile(bool eof = false);
     void makeIndexFile(bool eof = false);
 private:
 private:
-    string _file_prefix;
     float _seg_duration = 0;
     float _seg_duration = 0;
     uint32_t _seg_number = 0;
     uint32_t _seg_number = 0;
     uint64_t _file_index = 0;
     uint64_t _file_index = 0;
-    uint32_t _stamp_last = 0;
+    Ticker _ticker;
     string _last_file_name;
     string _last_file_name;
     std::deque<tuple<int,string> > _seg_dur_list;
     std::deque<tuple<int,string> > _seg_dur_list;
 };
 };