From 84dbe5597da90cb974a912ec01a3512f906f8aee Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Thu, 25 Oct 2018 15:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Player/PlayerBase.h     | 17 +++++++++++------
 src/RtmpMuxer/RtmpMuxer.cpp |  5 +++++
 src/RtmpMuxer/RtmpMuxer.h   |  4 ++++
 src/RtspMuxer/RtspMuxer.cpp |  5 +++++
 src/RtspMuxer/RtspMuxer.h   |  4 ++++
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/Player/PlayerBase.h b/src/Player/PlayerBase.h
index dbd6f722..43324b71 100644
--- a/src/Player/PlayerBase.h
+++ b/src/Player/PlayerBase.h
@@ -42,7 +42,17 @@ using namespace toolkit;
 
 namespace mediakit {
 
-class PlayerBase : public mINI{
+class DemuxerBase {
+public:
+	typedef std::shared_ptr<DemuxerBase> Ptr;
+
+	virtual float getDuration() const { return 0;}
+	virtual bool isInited() const { return true; }
+	virtual vector<Track::Ptr> getTracks() const { return vector<Track::Ptr>();}
+};
+
+
+class PlayerBase : public DemuxerBase, public mINI{
 public:
 	typedef std::shared_ptr<PlayerBase> Ptr;
 	typedef enum {
@@ -76,13 +86,8 @@ public:
     virtual float getProgress() const { return 0;}
     virtual void seekTo(float fProgress) {}
     virtual void setMediaSouce(const MediaSource::Ptr & src) {}
-
-	virtual bool isInited() const { return true; }
 	//TrackVideo = 0, TrackAudio = 1
 	virtual float getRtpLossRate(int trackType) const {return 0; }
-    virtual float getDuration() const { return 0;}
-
-	virtual vector<Track::Ptr> getTracks() const { return vector<Track::Ptr>();}
 protected:
     virtual void onShutdown(const SockException &ex) {}
     virtual void onPlayResult(const SockException &ex) {}
diff --git a/src/RtmpMuxer/RtmpMuxer.cpp b/src/RtmpMuxer/RtmpMuxer.cpp
index 12b644f5..402a0b23 100644
--- a/src/RtmpMuxer/RtmpMuxer.cpp
+++ b/src/RtmpMuxer/RtmpMuxer.cpp
@@ -101,6 +101,11 @@ void RtmpMuxer::inputFrame(const Frame::Ptr &frame) {
             _trackReadyCallback.erase(it_callback);
         }
     }
+
+    if(!_inited && _trackReadyCallback.empty()){
+        _inited = true;
+        onInited();
+    }
 }
 
 bool RtmpMuxer::inputRtmp(const RtmpPacket::Ptr &rtmp , bool key_pos) {
diff --git a/src/RtmpMuxer/RtmpMuxer.h b/src/RtmpMuxer/RtmpMuxer.h
index d0f2ae71..770aa06b 100644
--- a/src/RtmpMuxer/RtmpMuxer.h
+++ b/src/RtmpMuxer/RtmpMuxer.h
@@ -72,11 +72,15 @@ public:
      * @return
      */
     RtmpRingInterface::RingType::Ptr getRtmpRing() const;
+
+protected:
+    virtual void onInited(){};
 private:
     map<int,Track::Ptr> _track_map;
     map<int,function<void()> > _trackReadyCallback;
     RtmpRingInterface::RingType::Ptr _rtmpRing;
     AMFValue _metedata;
+    bool  _inited = false;
 };
 
 
diff --git a/src/RtspMuxer/RtspMuxer.cpp b/src/RtspMuxer/RtspMuxer.cpp
index 62418df6..e420300e 100644
--- a/src/RtspMuxer/RtspMuxer.cpp
+++ b/src/RtspMuxer/RtspMuxer.cpp
@@ -89,6 +89,11 @@ void RtspMuxer::inputFrame(const Frame::Ptr &frame) {
             _trackReadyCallback.erase(it_callback);
         }
     }
+
+    if(!_inited && _trackReadyCallback.empty()){
+        _inited = true;
+        onInited();
+    }
 }
 
 bool RtspMuxer::inputRtp(const RtpPacket::Ptr &rtp, bool key_pos) {
diff --git a/src/RtspMuxer/RtspMuxer.h b/src/RtspMuxer/RtspMuxer.h
index 5cc1ece4..05d90003 100644
--- a/src/RtspMuxer/RtspMuxer.h
+++ b/src/RtspMuxer/RtspMuxer.h
@@ -76,11 +76,15 @@ public:
      * @return
      */
     RtpRingInterface::RingType::Ptr getRtpRing() const;
+
+protected:
+    virtual void onInited(){};
 private:
     map<int,Track::Ptr> _track_map;
     map<int,function<void()> > _trackReadyCallback;
     RtpRingInterface::RingType::Ptr _rtpRing;
     string _sdp;
+    bool _inited = false;
 };