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

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,82 +21,75 @@
 #include "TsPlayer.h"
 
 using namespace toolkit;
+
 namespace mediakit {
 
-    class TsDemuxer : public MediaSinkInterface, public TrackSource, public std::enable_shared_from_this<TsDemuxer> {
-    public:
-        TsDemuxer() = default;
+class TsDemuxer : public MediaSinkInterface, public TrackSource, public std::enable_shared_from_this<TsDemuxer> {
+public:
+    TsDemuxer() = default;
+    ~TsDemuxer() override { _timer = nullptr; }
 
-        ~TsDemuxer() override { _timer = nullptr; }
+    void start(const EventPoller::Ptr &poller, TrackListener *listener);
 
-        void start(const EventPoller::Ptr &poller, TrackListener *listener);
+    bool inputFrame(const Frame::Ptr &frame) override;
 
-        bool inputFrame(const Frame::Ptr &frame) override;
+    bool addTrack(const Track::Ptr &track) override {
+        return _delegate.addTrack(track);
+    }
 
-        bool addTrack(const Track::Ptr &track) override {
-            return _delegate.addTrack(track);
-        }
+    void addTrackCompleted() override {
+        _delegate.addTrackCompleted();
+    }
 
-        void addTrackCompleted() override {
-            _delegate.addTrackCompleted();
-        }
+    void resetTracks() override {
+        ((MediaSink &) _delegate).resetTracks();
+    }
 
-        void resetTracks() override {
-            ((MediaSink &) _delegate).resetTracks();
-        }
+    vector<Track::Ptr> getTracks(bool ready = true) const override {
+        return _delegate.getTracks(ready);
+    }
 
-        vector<Track::Ptr> getTracks(bool ready = true) const override {
-            return _delegate.getTracks(ready);
-        }
+private:
+    void onTick();
+    int64_t getBufferMS();
+    int64_t getPlayPosition();
+    void setPlayPosition(int64_t pos);
 
-    private:
-        void onTick();
+private:
+    int64_t _ticker_offset = 0;
+    Ticker _ticker;
+    Stamp _stamp[2];
+    Timer::Ptr _timer;
+    MediaSinkDelegate _delegate;
+    multimap<int64_t, Frame::Ptr> _frame_cache;
+};
 
-        int64_t getBufferMS();
+class TsPlayerImp : public PlayerImp<TsPlayer, PlayerBase>, private TrackListener {
+public:
+    using Ptr = std::shared_ptr<TsPlayerImp>;
 
-        int64_t getPlayPosition();
+    TsPlayerImp(const EventPoller::Ptr &poller = nullptr);
+    ~TsPlayerImp() override = default;
 
-        void setPlayPosition(int64_t pos);
+private:
+    //// HlsPlayer override////
+    void onPacket(const char *data, size_t len) override;
 
-    private:
-        int64_t _ticker_offset = 0;
-        Ticker _ticker;
-        Stamp _stamp[2];
-        Timer::Ptr _timer;
-        MediaSinkDelegate _delegate;
-        multimap<int64_t, Frame::Ptr> _frame_cache;
-    };
+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:
+    //// TrackListener override////
+    bool addTrack(const Track::Ptr &track) override { return true; };
+    void addTrackCompleted() override;
 
-    class TsPlayerImp : public PlayerImp<TsPlayer, PlayerBase>, private TrackListener {
-    public:
-        typedef std::shared_ptr<TsPlayerImp> Ptr;
+private:
+    DecoderImp::Ptr _decoder;
+    MediaSinkInterface::Ptr _demuxer;
+};
 
-        TsPlayerImp(const EventPoller::Ptr &poller = nullptr);
-
-        ~TsPlayerImp() override = default;
-
-    private:
-        //// HlsPlayer override////
-        void onPacket(const char *data, size_t len) override;
-
-    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:
-        //// TrackListener override////
-        bool addTrack(const Track::Ptr &track) override { return true; };
-
-        void addTrackCompleted() override;
-
-    private:
-        DecoderImp::Ptr _decoder;
-        MediaSinkInterface::Ptr _demuxer;
-    };
 }//namespace mediakit
 #endif //HTTP_TSPLAYERIMP_H