完善getOriginUrl接口

src/Common/MediaSource.cpp

@@ -40,6 +40,17 @@ string getOriginTypeString(MediaOriginType type){
     }
 }
 
+static string getOriginUrl_l(const MediaSource *thiz) {
+    if (thiz == MediaSource::NullMediaSource) {
+        return "";
+    }
+    return thiz->getSchema() + "://" + thiz->getVhost() + "/" + thiz->getApp() + "/" + thiz->getId();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+MediaSource * const MediaSource::NullMediaSource = nullptr;
+
 MediaSource::MediaSource(const string &schema, const string &vhost, const string &app, const string &stream_id){
     GET_CONFIG(bool, enableVhost, General::kEnableVhost);
     if (!enableVhost) {
@@ -136,9 +147,13 @@ MediaOriginType MediaSource::getOriginType() const {
 string MediaSource::getOriginUrl() const {
     auto listener = _listener.lock();
     if (!listener) {
-        return "";
+        return getOriginUrl_l(this);
+    }
+    auto ret = listener->getOriginUrl(const_cast<MediaSource &>(*this));
+    if (!ret.empty()) {
+        return ret;
     }
-    return listener->getOriginUrl(const_cast<MediaSource &>(*this));
+    return getOriginUrl_l(this);
 }
 
 std::shared_ptr<SockInfo> MediaSource::getOriginSock() const {
@@ -567,6 +582,10 @@ void MediaSourceEvent::onReaderChanged(MediaSource &sender, int size){
     }, nullptr);
 }
 
+string MediaSourceEvent::getOriginUrl(MediaSource &sender) const {
+    return getOriginUrl_l(&sender);
+}
+
 MediaOriginType MediaSourceEventInterceptor::getOriginType(MediaSource &sender) const {
     auto listener = _listener.lock();
     if (!listener) {
@@ -578,9 +597,13 @@ MediaOriginType MediaSourceEventInterceptor::getOriginType(MediaSource &sender)
 string MediaSourceEventInterceptor::getOriginUrl(MediaSource &sender) const {
     auto listener = _listener.lock();
     if (!listener) {
-        return "";
+        return MediaSourceEvent::getOriginUrl(sender);
+    }
+    auto ret = listener->getOriginUrl(sender);
+    if (!ret.empty()) {
+        return ret;
     }
-    return listener->getOriginUrl(sender);
+    return MediaSourceEvent::getOriginUrl(sender);
 }
 
 std::shared_ptr<SockInfo> MediaSourceEventInterceptor::getOriginSock(MediaSource &sender) const {

src/Common/MediaSource.h

@@ -61,7 +61,7 @@ public:
     // 获取媒体源类型
     virtual MediaOriginType getOriginType(MediaSource &sender) const { return MediaOriginType::unknown; }
     // 获取媒体源url或者文件路径
-    virtual string getOriginUrl(MediaSource &sender) const { return ""; }
+    virtual string getOriginUrl(MediaSource &sender) const;
     // 获取媒体源客户端相关信息
     virtual std::shared_ptr<SockInfo> getOriginSock(MediaSource &sender) const { return nullptr; }
 
@@ -198,7 +198,7 @@ private:
  */
 class MediaSource: public TrackSource, public enable_shared_from_this<MediaSource> {
 public:
-    static constexpr MediaSource *NullMediaSource = nullptr;
+    static MediaSource * const NullMediaSource;
     using Ptr = std::shared_ptr<MediaSource>;
     using StreamMap = unordered_map<string, weak_ptr<MediaSource> >;
     using AppStreamMap = unordered_map<string, StreamMap>;

src/Common/MultiMediaSourceMuxer.cpp

@@ -58,6 +58,14 @@ static string getTrackInfoStr(const TrackSource *track_src){
 
 MultiMediaSourceMuxer::MultiMediaSourceMuxer(const string &vhost, const string &app, const string &stream, float dur_sec,
                                              bool enable_rtsp, bool enable_rtmp, bool enable_hls, bool enable_mp4) {
+    _get_origin_url = [this, vhost, app, stream]() {
+        auto ret = getOriginUrl(*MediaSource::NullMediaSource);
+        if (!ret.empty()) {
+            return ret;
+        }
+        return vhost + "/" + app + "/" + stream;
+    };
+
     if (enable_rtmp) {
         _rtmp = std::make_shared<RtmpMediaSourceMuxer>(vhost, app, stream, std::make_shared<TitleMeta>(dur_sec));
     }
@@ -286,7 +294,7 @@ void MultiMediaSourceMuxer::onAllTrackReady() {
     if (listener) {
         listener->onAllTrackReady();
     }
-    InfoL << "stream: " << getOriginUrl(*MediaSource::NullMediaSource) << " , codec info: " << getTrackInfoStr(this);
+    InfoL << "stream: " << _get_origin_url() << " , codec info: " << getTrackInfoStr(this);
 }
 
 void MultiMediaSourceMuxer::resetTracks() {

src/Common/MultiMediaSourceMuxer.h

@@ -145,6 +145,7 @@ private:
     Ticker _last_check;
     Stamp _stamp[2];
     std::weak_ptr<Listener> _track_listener;
+    function<string()> _get_origin_url;
 #if defined(ENABLE_RTPPROXY)
     mutex _rtp_sender_mtx;
 	unordered_map<string, RtpSender::Ptr> _rtp_sender;

src/Rtp/RtpProcess.cpp

@@ -262,10 +262,10 @@ MediaOriginType RtpProcess::getOriginType(MediaSource &sender) const{
 }
 
 string RtpProcess::getOriginUrl(MediaSource &sender) const {
-    return _media_info._full_url;
+    return _media_info._schema + "://" + _media_info._vhost + "/" + _media_info._app + "/" + _media_info._streamid;
 }
 
-std::shared_ptr<SockInfo> RtpProcess::getOriginSock(MediaSource &sender) const{
+std::shared_ptr<SockInfo> RtpProcess::getOriginSock(MediaSource &sender) const {
     return const_cast<RtpProcess *>(this)->shared_from_this();
 }