HLS切片间隔以数据时间戳为准:#463

src/Record/HlsMaker.cpp

@@ -62,14 +62,16 @@ void HlsMaker::makeIndexFile(bool eof) {
 void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp, bool is_idr_fast_packet) {
     if (data && len) {
         if (is_idr_fast_packet) {
+            //尝试切片ts
             addNewSegment(timestamp);
         }
+        if (!_last_file_name.empty()) {
+            //存在切片才写入ts数据
             onWriteSegment((char *) data, len);
-        //记录上次写入数据时间
+        }
-        _ticker_last_data.resetTime();
     } else {
         //resetTracks时触发此逻辑
-        flushLastSegment(true);
+        flushLastSegment(timestamp, true);
     }
 }
 
@@ -90,27 +92,27 @@ void HlsMaker::delOldSegment() {
     }
 }
 
-void HlsMaker::addNewSegment(uint32_t) {
+void HlsMaker::addNewSegment(uint32_t stamp) {
-    if(!_last_file_name.empty() && _ticker.elapsedTime() < _seg_duration * 1000){
+    if (!_last_file_name.empty() && stamp - _last_seg_timestamp < _seg_duration * 1000) {
         //存在上个切片，并且未到分片时间
         return;
     }
 
     //关闭并保存上一个切片，如果_seg_number==0,那么是点播。
-    flushLastSegment(_seg_number == 0);
+    flushLastSegment(stamp, _seg_number == 0);
     //新增切片
     _last_file_name = onOpenSegment(_file_index++);
-    //重置切片计时器
+    //记录本次切片的起始时间戳
-    _ticker.resetTime();
+    _last_seg_timestamp = stamp;
 }
 
-void HlsMaker::flushLastSegment(bool eof){
+void HlsMaker::flushLastSegment(uint32_t timestamp, bool eof){
     if (_last_file_name.empty()) {
         //不存在上个切片
         return;
     }
     //文件创建到最后一次数据写入的时间即为切片长度
-    auto seg_dur = _ticker.elapsedTime() - _ticker_last_data.elapsedTime();
+    auto seg_dur = timestamp - _last_seg_timestamp;
     if (seg_dur <= 0) {
         seg_dur = 100;
     }
@@ -125,12 +127,10 @@ bool HlsMaker::isLive() {
 }
 
 void HlsMaker::clear() {
+    _file_index = 0;
+    _last_seg_timestamp = 0;
     _seg_dur_list.clear();
     _last_file_name.clear();
-    _ticker_last_data.resetTime();
-    _ticker.resetTime();
-    _file_index = 0;
 }
 
-
 }//namespace mediakit

src/Record/HlsMaker.h

@@ -80,9 +80,10 @@ protected:
 
     /**
      * 关闭上个ts切片并且写入m3u8索引
+     * @param timestamp 毫秒时间戳
      * @param eof
      */
-    void flushLastSegment(bool eof = false);
+    void flushLastSegment(uint32_t timestamp, bool eof = false);
 
 private:
     /**
@@ -103,11 +104,10 @@ private:
     void addNewSegment(uint32_t timestamp);
 
 private:
-    uint32_t _seg_number = 0;
     float _seg_duration = 0;
+    uint32_t _seg_number = 0;
+    uint32_t _last_seg_timestamp = 0;
     uint64_t _file_index = 0;
-    Ticker _ticker;
-    Ticker _ticker_last_data;
     string _last_file_name;
     std::deque<tuple<int,string> > _seg_dur_list;
 };

src/Record/TsMuxer.cpp

@@ -100,6 +100,7 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
                 break;
             }
         }
+
         case CodecH265: {
             //这里的代码逻辑是让SPS、PPS、IDR这些时间戳相同的帧打包到一起当做一个帧处理，
             if (!_frameCached.empty() && _frameCached.back()->dts() != frame->dts()) {
@@ -121,13 +122,14 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
                     merged_frame = std::make_shared<BufferString>(std::move(merged));
                 }
                 track_info.stamp.revise(back->dts(), back->pts(), dts_out, pts_out);
+                //取视频时间戳为TS的时间戳
                 _timestamp = dts_out;
                 mpeg_ts_write(_context, track_info.track_id, back->keyFrame() ? 0x0001 : 0, pts_out * 90LL,dts_out * 90LL, merged_frame->data(), merged_frame->size());
                 _frameCached.clear();
             }
             _frameCached.emplace_back(Frame::getCacheAbleFrame(frame));
-        }
             break;
+        }
 
         case CodecAAC: {
             if (frame->prefixSize() == 0) {
@@ -138,17 +140,20 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
 
         default: {
             track_info.stamp.revise(frame->dts(), frame->pts(), dts_out, pts_out);
+            if(!_have_video){
+                //没有视频时，才以音频时间戳为TS的时间戳
                 _timestamp = dts_out;
-            mpeg_ts_write(_context, track_info.track_id, frame->keyFrame() ? 0x0001 : 0, pts_out * 90LL, dts_out * 90LL, frame->data(), frame->size());
             }
+            mpeg_ts_write(_context, track_info.track_id, frame->keyFrame() ? 0x0001 : 0, pts_out * 90LL, dts_out * 90LL, frame->data(), frame->size());
             break;
         }
     }
+}
 
 void TsMuxer::resetTracks() {
     _have_video = false;
     //通知片段中断
-    onTs(nullptr, 0, 0, 0);
+    onTs(nullptr, 0, _timestamp, 0);
     uninit();
     init();
 }