简化代码:

- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo

src/Rtp/RtpProcess.cpp

@@ -52,9 +52,7 @@ RtpProcess::RtpProcess(const string &stream_id) {
 RtpProcess::~RtpProcess() {
     uint64_t duration = (_last_frame_time.createdTime() - _last_frame_time.elapsedTime()) / 1000;
     WarnP(this) << "RTP推流器("
-                << _media_info._vhost << "/"
-                << _media_info._app << "/"
-                << _media_info._streamid
+                << _media_info.shortUrl()
                 << ")断开,耗时(s):" << duration;
 
     //流量统计事件广播
@@ -272,7 +270,7 @@ MediaOriginType RtpProcess::getOriginType(MediaSource &sender) const{
 }
 
 string RtpProcess::getOriginUrl(MediaSource &sender) const {
-    return _media_info._schema + "://" + _media_info._vhost + "/" + _media_info._app + "/" + _media_info._streamid;
+    return _media_info.getUrl();
 }
 
 std::shared_ptr<SockInfo> RtpProcess::getOriginSock(MediaSource &sender) const {

src/Rtp/RtpSelector.cpp

@@ -144,7 +144,7 @@ bool RtpProcessHelper::close(MediaSource &sender, bool force) {
         return false;
     }
     parent->delProcess(_stream_id, _process.get());
-    WarnL << "close media:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId() << " " << force;
+    WarnL << "close media:" << sender.getUrl() << " " << force;
     return true;
 }
 

src/Rtp/RtpSession.cpp

@@ -129,7 +129,7 @@ bool RtpSession::close(MediaSource &sender, bool force) {
     if(!_process || (!force && static_pointer_cast<MediaSourceEvent>(_process)->totalReaderCount(sender))){
         return false;
     }
-    string err = StrPrinter << "close media:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId() << " " << force;
+    string err = StrPrinter << "close media:" << sender.getUrl() << " " << force;
     safeShutdown(SockException(Err_shutdown,err));
     return true;
 }