合并http-ts播放器特性: #1336

src/Http/HttpTSPlayer.cpp

@@ -51,7 +51,7 @@ void HttpTSPlayer::onResponseBody(const char *buf, size_t size, size_t recved_si
     if (_split_ts) {
         try {
             _segment.input(buf, size);
-        }catch (std::exception &ex)  {
+        } catch (std::exception &ex) {
             WarnL << ex.what();
             //ts解析失败，清空缓存数据
             _segment.reset();

src/Http/TsPlayer.cpp

@@ -1,47 +1,51 @@
-//
+/*
-// Created by alex on 2021/4/6.
+ * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
-//
+ * Created by alex on 2021/4/6.
+ * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ *
+ * Use of this source code is governed by MIT license that can be found in the
+ * LICENSE file in the root of the source tree. All contributing project authors
+ * may be found in the AUTHORS file in the root of the source tree.
+ */
 
 #include "TsPlayer.h"
 
 namespace mediakit {
 
-    TsPlayer::TsPlayer(const EventPoller::Ptr &poller):HttpTSPlayer(poller, true) {}
+TsPlayer::TsPlayer(const EventPoller::Ptr &poller) : HttpTSPlayer(poller, true) {}
 
-    TsPlayer::~TsPlayer() {}
+void TsPlayer::play(const string &strUrl) {
-
-    void TsPlayer::play(const string &strUrl) {
     _ts_url.append(strUrl);
     playTs();
-    }
+}
 
-    void TsPlayer::teardown_l(const SockException &ex) {
+void TsPlayer::teardown_l(const SockException &ex) {
     HttpClient::clear();
     shutdown(ex);
-    }
+}
 
-    void TsPlayer::teardown() {
+void TsPlayer::teardown() {
     teardown_l(SockException(Err_shutdown, "teardown"));
-    }
+}
 
-    void TsPlayer::playTs() {
+void TsPlayer::playTs() {
     if (waitResponse()) {
         //播放器目前还存活，正在下载中
         return;
     }
     WarnL << "fetch:" << _ts_url;
     _request_complete = false;
-        weak_ptr<TsPlayer> weak_self = dynamic_pointer_cast<TsPlayer>(shared_from_this());
+    weak_ptr <TsPlayer> weak_self = dynamic_pointer_cast<TsPlayer>(shared_from_this());
     setMethod("GET");
     sendRequest(_ts_url, 3600 * 2, 60);
-    }
+}
 
-    void TsPlayer::onResponseCompleted() {
+void TsPlayer::onResponseCompleted() {
     //接收完毕
     teardown_l(SockException(Err_success, StrPrinter << _ts_url << ": play completed"));
-    }
+}
 
-    void TsPlayer::onDisconnect(const SockException &ex) {
+void TsPlayer::onDisconnect(const SockException &ex) {
     WarnL << _ts_url << "   :" << ex.getErrCode() << " " << ex.what();
     if (_first) {
         //第一次失败，则播放失败
@@ -51,18 +55,19 @@ namespace mediakit {
     }
     if (ex.getErrCode() == Err_shutdown) {
         onShutdown(ex);
-        }else{
+    } else {
         onResponseCompleted();
         onShutdown(ex);
     }
-    }
+}
 
-    ssize_t TsPlayer::onResponseHeader(const string &status, const HttpClient::HttpHeader &header) {
+ssize_t TsPlayer::onResponseHeader(const string &status, const HttpClient::HttpHeader &header) {
     ssize_t ret = HttpTSPlayer::onResponseHeader(status, header);
     if (_first) {
         _first = false;
         onPlayResult(SockException(Err_success, "play success"));
     }
     return ret;
-    }
+}
+
 }//namespace mediakit

src/Http/TsPlayer.h

@@ -1,10 +1,6 @@
-//
-// Created by alex on 2021/4/6.
-//
-
 /*
  * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
- *
+ * Created by alex on 2021/4/6.
  * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
  *
  * Use of this source code is governed by MIT license that can be found in the
@@ -24,37 +20,37 @@
 #include "Rtp/TSDecoder.h"
 #include "HttpTSPlayer.h"
 
-
-
 using namespace toolkit;
 namespace mediakit {
 
-    class TsPlayer : public  HttpTSPlayer , public PlayerBase {
+class TsPlayer : public HttpTSPlayer, public PlayerBase {
-    public:
+public:
     TsPlayer(const EventPoller::Ptr &poller);
-        ~TsPlayer() override;
+    ~TsPlayer() override = default;
+
     /**
      * 开始播放
-         * @param strUrl
      */
-        void play(const string &strUrl) override;
+    void play(const string &url) override;
+
     /**
      * 停止播放
      */
     void teardown() override;
-    private:
+
+private:
     void playTs();
     void teardown_l(const SockException &ex);
 
-    protected:
+protected:
     virtual void onResponseCompleted() override;
-
     virtual void onDisconnect(const SockException &ex) override;
-
     virtual ssize_t onResponseHeader(const string &status, const HttpHeader &header) override;
-    private:
+
+private:
     bool _first = true;
     string _ts_url;
-    };
+};
+
 }//namespace mediakit
 #endif //HTTP_TSPLAYER_H

src/Http/TsPlayerImp.h

@@ -1,6 +1,12 @@
-//
+/*
-// Created by alex on 2021/7/5.
+ * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
-//
+ * Created by alex on 2021/4/6.
+ * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ *
+ * Use of this source code is governed by MIT license that can be found in the
+ * LICENSE file in the root of the source tree. All contributing project authors
+ * may be found in the AUTHORS file in the root of the source tree.
+ */
 
 #ifndef HTTP_TSPLAYERIMP_H
 #define HTTP_TSPLAYERIMP_H
@@ -15,12 +21,12 @@
 #include "TsPlayer.h"
 
 using namespace toolkit;
+
 namespace mediakit {
 
-    class TsDemuxer : public MediaSinkInterface, public TrackSource, public std::enable_shared_from_this<TsDemuxer> {
+class TsDemuxer : public MediaSinkInterface, public TrackSource, public std::enable_shared_from_this<TsDemuxer> {
-    public:
+public:
     TsDemuxer() = default;
-
     ~TsDemuxer() override { _timer = nullptr; }
 
     void start(const EventPoller::Ptr &poller, TrackListener *listener);
@@ -43,54 +49,47 @@ namespace mediakit {
         return _delegate.getTracks(ready);
     }
 
-    private:
+private:
     void onTick();
-
     int64_t getBufferMS();
-
     int64_t getPlayPosition();
-
     void setPlayPosition(int64_t pos);
 
-    private:
+private:
     int64_t _ticker_offset = 0;
     Ticker _ticker;
     Stamp _stamp[2];
     Timer::Ptr _timer;
     MediaSinkDelegate _delegate;
     multimap<int64_t, Frame::Ptr> _frame_cache;
-    };
+};
 
-
+class TsPlayerImp : public PlayerImp<TsPlayer, PlayerBase>, private TrackListener {
-    class TsPlayerImp : public PlayerImp<TsPlayer, PlayerBase>, private TrackListener {
+public:
-    public:
+    using Ptr = std::shared_ptr<TsPlayerImp>;
-        typedef std::shared_ptr<TsPlayerImp> Ptr;
 
     TsPlayerImp(const EventPoller::Ptr &poller = nullptr);
-
     ~TsPlayerImp() override = default;
 
-    private:
+private:
     //// HlsPlayer override////
     void onPacket(const char *data, size_t len) override;
 
-    private:
+private:
     //// PlayerBase override////
     void onPlayResult(const SockException &ex) override;
-
     vector<Track::Ptr> getTracks(bool ready = true) const override;
-
     void onShutdown(const SockException &ex) override;
 
-    private:
+private:
     //// TrackListener override////
     bool addTrack(const Track::Ptr &track) override { return true; };
-
     void addTrackCompleted() override;
 
-    private:
+private:
     DecoderImp::Ptr _decoder;
     MediaSinkInterface::Ptr _demuxer;
-    };
+};
+
 }//namespace mediakit
 #endif //HTTP_TSPLAYERIMP_H

src/Http/TsplayerImp.cpp

@@ -1,7 +1,18 @@
+/*
+ * Copyright (c) 2020 The ZLMediaKit project authors. All Rights Reserved.
+ * Created by alex on 2021/4/6.
+ * This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
+ *
+ * Use of this source code is governed by MIT license that can be found in the
+ * LICENSE file in the root of the source tree. All contributing project authors
+ * may be found in the AUTHORS file in the root of the source tree.
+ */
+
 #include "TsPlayerImp.h"
 
 namespace mediakit {
-    void TsDemuxer::start(const EventPoller::Ptr &poller, TrackListener *listener) {
+
+void TsDemuxer::start(const EventPoller::Ptr &poller, TrackListener *listener) {
     _frame_cache.clear();
     _stamp[TrackAudio].setRelativeStamp(0);
     _stamp[TrackVideo].setRelativeStamp(0);
@@ -11,7 +22,7 @@ namespace mediakit {
     _delegate.setTrackListener(listener);
 
     //每50毫秒执行一次
-        weak_ptr<TsDemuxer> weak_self = shared_from_this();
+    weak_ptr <TsDemuxer> weak_self = shared_from_this();
     _timer = std::make_shared<Timer>(0.05f, [weak_self]() {
         auto strong_self = weak_self.lock();
         if (!strong_self) {
@@ -20,9 +31,9 @@ namespace mediakit {
         strong_self->onTick();
         return true;
     }, poller);
-    }
+}
 
-    bool TsDemuxer::inputFrame(const Frame::Ptr &frame) {
+bool TsDemuxer::inputFrame(const Frame::Ptr &frame) {
     //为了避免track准备时间过长, 因此在没准备好之前, 直接消费掉所有的帧
     if (!_delegate.isAllTrackReady()) {
         _delegate.inputFrame(frame);
@@ -33,8 +44,6 @@ namespace mediakit {
     //根据时间戳缓存frame
     _stamp[frame->getTrackType()].revise(frame->dts(), frame->pts(), dts, pts);
     _frame_cache.emplace(dts, Frame::getCacheAbleFrame(frame));
-        //根据时间戳缓存frame
-//    _frame_cache.emplace(dts, Frame::getCacheAbleFrame(frame));
 
     if (getBufferMS() > 30 * 1000) {
         //缓存超过30秒，强制消费至15秒(减少延时或内存占用)
@@ -46,25 +55,25 @@ namespace mediakit {
         setPlayPosition(_frame_cache.begin()->first);
     }
     return true;
-    }
+}
 
-    int64_t TsDemuxer::getPlayPosition() {
+int64_t TsDemuxer::getPlayPosition() {
     return _ticker.elapsedTime() + _ticker_offset;
-    }
+}
 
-    int64_t TsDemuxer::getBufferMS() {
+int64_t TsDemuxer::getBufferMS() {
     if (_frame_cache.empty()) {
         return 0;
     }
     return _frame_cache.rbegin()->first - _frame_cache.begin()->first;
-    }
+}
 
-    void TsDemuxer::setPlayPosition(int64_t pos) {
+void TsDemuxer::setPlayPosition(int64_t pos) {
     _ticker.resetTime();
     _ticker_offset = pos;
-    }
+}
 
-    void TsDemuxer::onTick() {
+void TsDemuxer::onTick() {
     auto it = _frame_cache.begin();
     while (it != _frame_cache.end()) {
         if (it->first > getPlayPosition()) {
@@ -80,13 +89,13 @@ namespace mediakit {
         _delegate.inputFrame(it->second);
         it = _frame_cache.erase(it);
     }
-    }
+}
 
 //////////////////////////////////////////////////////////////////////////
 
-    TsPlayerImp::TsPlayerImp(const EventPoller::Ptr &poller) : PlayerImp<TsPlayer, PlayerBase>(poller) {}
+TsPlayerImp::TsPlayerImp(const EventPoller::Ptr &poller) : PlayerImp<TsPlayer, PlayerBase>(poller) {}
 
-    void TsPlayerImp::onPacket(const char *data, size_t len) {
+void TsPlayerImp::onPacket(const char *data, size_t len) {
     if (!_decoder) {
         _decoder = DecoderImp::createDecoder(DecoderImp::decoder_ts, _demuxer.get());
     }
@@ -94,13 +103,13 @@ namespace mediakit {
     if (_decoder && _demuxer) {
         _decoder->input((uint8_t *) data, len);
     }
-    }
+}
 
-    void TsPlayerImp::addTrackCompleted() {
+void TsPlayerImp::addTrackCompleted() {
     PlayerImp<TsPlayer, PlayerBase>::onPlayResult(SockException(Err_success, "play hls success"));
-    }
+}
 
-    void TsPlayerImp::onPlayResult(const SockException &ex) {
+void TsPlayerImp::onPlayResult(const SockException &ex) {
     WarnL << ex.getErrCode() << " " << ex.what();
     if (ex) {
         PlayerImp<TsPlayer, PlayerBase>::onPlayResult(ex);
@@ -109,15 +118,15 @@ namespace mediakit {
         demuxer->start(getPoller(), this);
         _demuxer = std::move(demuxer);
     }
-    }
+}
 
-    void TsPlayerImp::onShutdown(const SockException &ex) {
+void TsPlayerImp::onShutdown(const SockException &ex) {
     PlayerImp<TsPlayer, PlayerBase>::onShutdown(ex);
     _demuxer = nullptr;
-    }
+}
 
-    vector<Track::Ptr> TsPlayerImp::getTracks(bool ready) const {
+vector <Track::Ptr> TsPlayerImp::getTracks(bool ready) const {
     return static_pointer_cast<TsDemuxer>(_demuxer)->getTracks(ready);
-    }
+}
 
 }//namespace mediakit

src/Player/PlayerBase.cpp

@@ -48,14 +48,13 @@ PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &poller, const s
     if (strcasecmp("rtmp", prefix.data()) == 0) {
         return PlayerBase::Ptr(new RtmpPlayerImp(poller), releasePlayer);
     }
-    if ((strcasecmp("http",prefix.data()) == 0 || strcasecmp("https",prefix.data()) == 0)) {
+    if ((strcasecmp("http", prefix.data()) == 0 || strcasecmp("https", prefix.data()) == 0)) {
         if (end_with(url, ".m3u8") || end_with(url_in, ".m3u8")) {
-            return PlayerBase::Ptr(new HlsPlayerImp(poller),releasePlayer);
+            return PlayerBase::Ptr(new HlsPlayerImp(poller), releasePlayer);
+        } else if (end_with(url, ".ts") || end_with(url_in, ".ts")) {
+            return PlayerBase::Ptr(new TsPlayerImp(poller), releasePlayer);
         }
-        else if (end_with(url, ".ts") || end_with(url_in, ".ts")) {
+        return PlayerBase::Ptr(new TsPlayerImp(poller), releasePlayer);
-            return PlayerBase::Ptr(new TsPlayerImp(poller),releasePlayer);
-        }
-        return PlayerBase::Ptr(new TsPlayerImp(poller),releasePlayer);
     }
 
     return PlayerBase::Ptr(new RtspPlayerImp(poller), releasePlayer);