整理MediaSource代码

src/Player/MediaPlayer.cpp

@@ -42,13 +42,13 @@ MediaPlayer::MediaPlayer(const EventPoller::Ptr &poller) {
 MediaPlayer::~MediaPlayer() {
 }
 void MediaPlayer::play(const string &strUrl) {
-	_parser = PlayerBase::createPlayer(_poller,strUrl);
-	_parser->setOnShutdown(_shutdownCB);
-	_parser->setOnPlayResult(_playResultCB);
-    _parser->setOnResume(_resumeCB);
-    _parser->setMediaSouce(_pMediaSrc);
-	_parser->mINI::operator=(*this);
-	_parser->play(strUrl);
+	_delegate = PlayerBase::createPlayer(_poller,strUrl);
+	_delegate->setOnShutdown(_shutdownCB);
+	_delegate->setOnPlayResult(_playResultCB);
+    _delegate->setOnResume(_resumeCB);
+    _delegate->setMediaSouce(_pMediaSrc);
+	_delegate->mINI::operator=(*this);
+	_delegate->play(strUrl);
 }
 
 EventPoller::Ptr MediaPlayer::getPoller(){
@@ -56,14 +56,14 @@ EventPoller::Ptr MediaPlayer::getPoller(){
 }
 
 void MediaPlayer::pause(bool bPause) {
-	if (_parser) {
-		_parser->pause(bPause);
+	if (_delegate) {
+		_delegate->pause(bPause);
 	}
 }
 
 void MediaPlayer::teardown() {
-	if (_parser) {
-		_parser->teardown();
+	if (_delegate) {
+		_delegate->teardown();
 	}
 }
 

src/Player/PlayerBase.h

@@ -127,6 +127,13 @@ public:
      * @return
      */
 	virtual float getPacketLossRate(TrackType trackType) const {return 0; }
+
+    /**
+     * 获取所有track
+     */
+    vector<Track::Ptr> getTracks(bool trackReady = true) const override{
+        return vector<Track::Ptr>();
+    }
 protected:
     virtual void onShutdown(const SockException &ex) {}
     virtual void onPlayResult(const SockException &ex) {}
@@ -136,9 +143,8 @@ protected:
     virtual void onResume(){};
 };
 
-template<typename Parent,typename Parser>
-class PlayerImp : public Parent
-{
+template<typename Parent,typename Delegate>
+class PlayerImp : public Parent {
 public:
 	typedef std::shared_ptr<PlayerImp> Ptr;
 
@@ -147,62 +153,62 @@ public:
 
 	virtual ~PlayerImp(){}
 	void setOnShutdown(const function<void(const SockException &)> &cb) override {
-		if (_parser) {
-			_parser->setOnShutdown(cb);
+		if (_delegate) {
+			_delegate->setOnShutdown(cb);
 		}
 		_shutdownCB = cb;
 	}
 	void setOnPlayResult(const function<void(const SockException &ex)> &cb) override {
-		if (_parser) {
-			_parser->setOnPlayResult(cb);
+		if (_delegate) {
+			_delegate->setOnPlayResult(cb);
 		}
 		_playResultCB = cb;
 	}
 
     void setOnResume(const function<void()> &cb) override {
-        if (_parser) {
-            _parser->setOnResume(cb);
+        if (_delegate) {
+            _delegate->setOnResume(cb);
         }
         _resumeCB = cb;
     }
 
     bool isInited(int analysisMs) override{
-        if (_parser) {
-            return _parser->isInited(analysisMs);
+        if (_delegate) {
+            return _delegate->isInited(analysisMs);
         }
-        return PlayerBase::isInited(analysisMs);
+        return Parent::isInited(analysisMs);
     }
 	float getDuration() const override {
-		if (_parser) {
-			return _parser->getDuration();
+		if (_delegate) {
+			return _delegate->getDuration();
 		}
-		return PlayerBase::getDuration();
+		return Parent::getDuration();
 	}
     float getProgress() const override{
-        if (_parser) {
-            return _parser->getProgress();
+        if (_delegate) {
+            return _delegate->getProgress();
         }
-        return PlayerBase::getProgress();
+        return Parent::getProgress();
     }
     void seekTo(float fProgress) override{
-        if (_parser) {
-            return _parser->seekTo(fProgress);
+        if (_delegate) {
+            return _delegate->seekTo(fProgress);
         }
-        return PlayerBase::seekTo(fProgress);
+        return Parent::seekTo(fProgress);
     }
 
     void setMediaSouce(const MediaSource::Ptr & src) override {
-		if (_parser) {
-			_parser->setMediaSouce(src);
+		if (_delegate) {
+			_delegate->setMediaSouce(src);
 		}
 		_pMediaSrc = src;
     }
 
     vector<Track::Ptr> getTracks(bool trackReady = true) const override{
-		if (_parser) {
-			return _parser->getTracks(trackReady);
+		if (_delegate) {
+			return _delegate->getTracks(trackReady);
 		}
-		return PlayerBase::getTracks(trackReady);
+		return Parent::getTracks(trackReady);
 	}
 protected:
 	void onShutdown(const SockException &ex) override {
@@ -228,7 +234,7 @@ protected:
 	function<void(const SockException &ex)> _shutdownCB;
 	function<void(const SockException &ex)> _playResultCB;
     function<void()> _resumeCB;
-    std::shared_ptr<Parser> _parser;
+    std::shared_ptr<Delegate> _delegate;
 	MediaSource::Ptr _pMediaSrc;
 };
 

src/Player/PlayerProxy.cpp

@@ -138,13 +138,13 @@ void PlayerProxy::play(const string &strUrlTmp) {
 	MediaPlayer::play(strUrlTmp);
 
 	MediaSource::Ptr mediaSource;
-	if(dynamic_pointer_cast<RtspPlayer>(_parser)){
+	if(dynamic_pointer_cast<RtspPlayer>(_delegate)){
 		//rtsp拉流
 		GET_CONFIG(bool,directProxy,Rtsp::kDirectProxy);
 		if(directProxy && _bEnableRtsp){
 			mediaSource = std::make_shared<RtspMediaSource>(_strVhost,_strApp,_strSrc);
 		}
-	} else if(dynamic_pointer_cast<RtmpPlayer>(_parser)){
+	} else if(dynamic_pointer_cast<RtmpPlayer>(_delegate)){
 		//rtmp拉流
 		if(_bEnableRtmp){
 			mediaSource = std::make_shared<RtmpMediaSource>(_strVhost,_strApp,_strSrc);