HLS: hls播放解决播放下一个切片导致数据丢失的bug： #1294

src/Http/HlsPlayer.h

@@ -96,7 +96,7 @@ private:
 private:
     void playDelay();
     float delaySecond();
-    void playNextTs(bool force = false);
+    void playNextTs();
     void teardown_l(const SockException &ex);
     void play_l();
     void onPacket_l(const char *data, size_t len);
@@ -112,7 +112,6 @@ private:
 private:
     bool _is_m3u8 = false;
     bool _first = true;
-    bool _waiting_response = false;
     int64_t _last_sequence = -1;
     string _m3u8;
     Timer::Ptr _timer;

src/Http/HttpTSPlayer.cpp

@@ -9,24 +9,23 @@
  */
 
 #include "HttpTSPlayer.h"
+
 namespace mediakit {
 
-HttpTSPlayer::HttpTSPlayer(const EventPoller::Ptr &poller, bool split_ts){
+HttpTSPlayer::HttpTSPlayer(const EventPoller::Ptr &poller, bool split_ts) {
     _split_ts = split_ts;
     _segment.setOnSegment([this](const char *data, size_t len) { onPacket(data, len); });
     setPoller(poller ? poller : EventPollerPool::Instance().getPoller());
 }
 
-HttpTSPlayer::~HttpTSPlayer() {}
-
-ssize_t HttpTSPlayer::onResponseHeader(const string &status, const HttpClient::HttpHeader &headers) {
+ssize_t HttpTSPlayer::onResponseHeader(const string &status, const HttpClient::HttpHeader &header) {
     _status = status;
     if (status != "200" && status != "206") {
         //http状态码不符合预期
         shutdown(SockException(Err_other, StrPrinter << "bad http status code:" + status));
         return 0;
     }
-    auto content_type = const_cast< HttpClient::HttpHeader &>(headers)["Content-Type"];
+    auto content_type = const_cast< HttpClient::HttpHeader &>(header)["Content-Type"];
     if (content_type.find("video/mp2t") == 0 || content_type.find("video/mpeg") == 0) {
         _is_ts_content = true;
     }
@@ -35,11 +34,11 @@ ssize_t HttpTSPlayer::onResponseHeader(const string &status, const HttpClient::H
     return -1;
 }
 
-void HttpTSPlayer::onResponseBody(const char *buf, size_t size, size_t recvedSize, size_t totalSize) {
+void HttpTSPlayer::onResponseBody(const char *buf, size_t size, size_t recved_size, size_t total_size) {
     if (_status != "200" && _status != "206") {
         return;
     }
-    if (recvedSize == size) {
+    if (recved_size == size) {
         //开始接收数据
         if (buf[0] == TS_SYNC_BYTE) {
             //这是ts头
@@ -57,14 +56,16 @@ void HttpTSPlayer::onResponseBody(const char *buf, size_t size, size_t recvedSiz
 }
 
 void HttpTSPlayer::onResponseCompleted() {
-    //接收完毕
-    shutdown(SockException(Err_success, "play completed"));
+    emitOnComplete(SockException(Err_success, "play completed"));
 }
 
 void HttpTSPlayer::onDisconnect(const SockException &ex) {
-    if (_on_disconnect) {
-        _on_disconnect(ex);
-        _on_disconnect = nullptr;
+    emitOnComplete(ex);
+}
+
+void HttpTSPlayer::emitOnComplete(const SockException &ex) {
+    if (_on_complete) {
+        _on_complete(ex);
     }
 }
 
@@ -74,12 +75,12 @@ void HttpTSPlayer::onPacket(const char *data, size_t len) {
     }
 }
 
-void HttpTSPlayer::setOnDisconnect(const HttpTSPlayer::onShutdown &cb) {
-    _on_disconnect = cb;
+void HttpTSPlayer::setOnComplete(onComplete cb) {
+    _on_complete = std::move(cb);
 }
 
-void HttpTSPlayer::setOnPacket(const TSSegment::onSegment &cb) {
-    _on_segment = cb;
+void HttpTSPlayer::setOnPacket(TSSegment::onSegment cb) {
+    _on_segment = std::move(cb);
 }
 
 }//namespace mediakit

src/Http/HttpTSPlayer.h

@@ -14,34 +14,47 @@
 #include "Http/HttpDownloader.h"
 #include "Player/MediaPlayer.h"
 #include "Rtp/TSDecoder.h"
+
 using namespace toolkit;
+
 namespace mediakit {
 
 //http-ts播发器，未实现ts解复用
-class HttpTSPlayer : public HttpClientImp{
+class HttpTSPlayer : public HttpClientImp {
 public:
-    typedef function<void(const SockException &)> onShutdown;
-    typedef std::shared_ptr<HttpTSPlayer> Ptr;
+    using Ptr = std::shared_ptr<HttpTSPlayer>;
+    using onComplete = std::function<void(const SockException &)>;
 
     HttpTSPlayer(const EventPoller::Ptr &poller = nullptr, bool split_ts = true);
-    ~HttpTSPlayer() override ;
+    ~HttpTSPlayer() override = default;
+
+    /**
+     * 设置下载完毕或异常断开回调
+     */
+    void setOnComplete(onComplete cb);
 
-    //设置异常断开回调
-    void setOnDisconnect(const onShutdown &cb);
-    //设置接收ts包回调
-    void setOnPacket(const TSSegment::onSegment &cb);
+    /**
+     * 设置接收ts包回调
+     */
+    void setOnPacket(TSSegment::onSegment cb);
 
 protected:
     ///HttpClient override///
-    ssize_t onResponseHeader(const string &status,const HttpHeader &headers) override;
-    void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize) override;
+    ssize_t onResponseHeader(const string &status, const HttpHeader &header) override;
+    void onResponseBody(const char *buf, size_t size, size_t recved_size, size_t total_size) override;
     void onResponseCompleted() override;
-    void onDisconnect(const SockException &ex) override ;
+    void onDisconnect(const SockException &ex) override;
 
-    //收到ts包
+protected:
+    /**
+     * 收到ts数据
+     */
     virtual void onPacket(const char *data, size_t len);
 
 private:
+    void emitOnComplete(const SockException &ex);
+
+private:
     //是否为mpegts负载
     bool _is_ts_content = false;
     //第一个包是否为ts包
@@ -50,7 +63,7 @@ private:
     bool _split_ts;
     string _status;
     TSSegment _segment;
-    onShutdown _on_disconnect;
+    onComplete _on_complete;
     TSSegment::onSegment _on_segment;
 };