diff --git a/daemon/src/sip/sipcall.cpp b/daemon/src/sip/sipcall.cpp index 4350d21c6810e23e0159497d954e1a1b61a04e5f..3af942e9b81491cb6cf4b570ab7dd0f3de1489de 100644 --- a/daemon/src/sip/sipcall.cpp +++ b/daemon/src/sip/sipcall.cpp @@ -94,16 +94,6 @@ void SIPCall::answer() setState(ACTIVE); } -std::map<std::string, std::string> -SIPCall::getDetails() -{ - std::map<std::string, std::string> details(Call::getDetails()); -#ifdef SFL_VIDEO - videortp_.addReceivingDetails(details); -#endif - return details; -} - std::map<std::string, std::string> SIPCall::createHistoryEntry() const { diff --git a/daemon/src/sip/sipcall.h b/daemon/src/sip/sipcall.h index 3ce4223c174164f31cd35d8de73ac38537b1ced3..bf3106bca8525b1d1d115158da9adfacf7ae6f46 100644 --- a/daemon/src/sip/sipcall.h +++ b/daemon/src/sip/sipcall.h @@ -113,9 +113,6 @@ class SIPCall : public Call { void setContactHeader(pj_str_t *contact); private: - // override of Call::getDetails - std::map<std::string, std::string> - getDetails(); // override of Call::createHistoryEntry std::map<std::string, std::string> diff --git a/daemon/src/video/video_receive_thread.cpp b/daemon/src/video/video_receive_thread.cpp index a31fb838590736c6ac2bc576201eba53bb76bdd6..e6f71f9fd5df15ee80526460ac54b8873e73d646 100644 --- a/daemon/src/video/video_receive_thread.cpp +++ b/daemon/src/video/video_receive_thread.cpp @@ -207,19 +207,6 @@ bool VideoReceiveThread::decodeFrame() return false; } -void VideoReceiveThread::addReceivingDetails( - std::map<std::string, std::string> &details) -{ - if (isRunning() and dstWidth_ > 0 and dstHeight_ > 0) { - details["VIDEO_SHM_PATH"] = sink_.openedName(); - std::ostringstream os; - os << dstWidth_; - details["VIDEO_WIDTH"] = os.str(); - os.str(""); - os << dstHeight_; - details["VIDEO_HEIGHT"] = os.str(); - } -} void VideoReceiveThread::enterConference() { diff --git a/daemon/src/video/video_receive_thread.h b/daemon/src/video/video_receive_thread.h index 851d9329aba7117de85fe5ca320d22416b8d5165..37b01b6a893302286763274e990120eda8438252 100644 --- a/daemon/src/video/video_receive_thread.h +++ b/daemon/src/video/video_receive_thread.h @@ -54,7 +54,6 @@ public: void addIOContext(SocketPair &socketPair); void setRequestKeyFrameCallback(void (*)(const std::string &)); - void addReceivingDetails(std::map<std::string, std::string> &details); void enterConference(); void exitConference(); diff --git a/daemon/src/video/video_rtp_session.cpp b/daemon/src/video/video_rtp_session.cpp index 4cef369c2254659bb9844b681340107f7f627570..e72a67ef3eee7b4f55e38f67e78dd2fef5235e12 100644 --- a/daemon/src/video/video_rtp_session.cpp +++ b/daemon/src/video/video_rtp_session.cpp @@ -225,13 +225,6 @@ void VideoRtpSession::forceKeyFrame() sender_->forceKeyFrame(); } -void VideoRtpSession::addReceivingDetails(std::map<std::string, std::string> &details) -{ - std::lock_guard<std::mutex> lock(mutex_); - if (receiveThread_) - receiveThread_->addReceivingDetails(details); -} - void VideoRtpSession::setupConferenceVideoPipeline() { std::lock_guard<std::mutex> lock(mutex_); diff --git a/daemon/src/video/video_rtp_session.h b/daemon/src/video/video_rtp_session.h index 7ece5309f89764be5653091235aaee42b2b67ccd..b5cfb9fe678572080dfb54c8c7c7b28a70e6d7ae 100644 --- a/daemon/src/video/video_rtp_session.h +++ b/daemon/src/video/video_rtp_session.h @@ -62,7 +62,6 @@ public: unsigned int port); void updateSDP(const Sdp &sdp); void forceKeyFrame(); - void addReceivingDetails(std::map<std::string, std::string> &details); void bindMixer(VideoMixer* mixer); void unbindMixer(); void setupConferenceVideoPipeline();