From 018fa40946795de92abe68924177e6282bf07709 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Thu, 5 Aug 2021 14:49:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0codec=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6,=E6=89=93=E5=8D=B0url=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MultiMediaSourceMuxer.cpp | 2 +- src/Common/MultiMediaSourceMuxer.h | 1 - webrtc/WebRtcTransport.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp index ec9c644f..30fcdfa1 100644 --- a/src/Common/MultiMediaSourceMuxer.cpp +++ b/src/Common/MultiMediaSourceMuxer.cpp @@ -286,7 +286,7 @@ void MultiMediaSourceMuxer::onAllTrackReady() { if (listener) { listener->onAllTrackReady(); } - InfoL << "stream: " << _stream_url << " , codec info: " << getTrackInfoStr(this); + InfoL << "stream: " << getOriginUrl(*MediaSource::NullMediaSource) << " , codec info: " << getTrackInfoStr(this); } void MultiMediaSourceMuxer::resetTracks() { diff --git a/src/Common/MultiMediaSourceMuxer.h b/src/Common/MultiMediaSourceMuxer.h index a3a782cb..5defdbff 100644 --- a/src/Common/MultiMediaSourceMuxer.h +++ b/src/Common/MultiMediaSourceMuxer.h @@ -142,7 +142,6 @@ protected: private: bool _is_enable = false; - string _stream_url; Ticker _last_check; Stamp _stamp[2]; std::weak_ptr _track_listener; diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 8ba3a252..dde68fc1 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -968,7 +968,7 @@ MediaOriginType WebRtcTransportImp::getOriginType(MediaSource &sender) const { } string WebRtcTransportImp::getOriginUrl(MediaSource &sender) const { - return ""; + return _media_info._full_url; } std::shared_ptr WebRtcTransportImp::getOriginSock(MediaSource &sender) const {