Skip to content
Snippets Groups Projects
Commit 63d3439e authored by Tristan Matthews's avatar Tristan Matthews
Browse files

video: don't add video information to getCallDetails

It's no longer used and can lead to a deadlock.

Refs #45610
parent 5e9ec4e0
No related branches found
No related tags found
No related merge requests found
...@@ -94,16 +94,6 @@ void SIPCall::answer() ...@@ -94,16 +94,6 @@ void SIPCall::answer()
setState(ACTIVE); 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> std::map<std::string, std::string>
SIPCall::createHistoryEntry() const SIPCall::createHistoryEntry() const
{ {
......
...@@ -113,9 +113,6 @@ class SIPCall : public Call { ...@@ -113,9 +113,6 @@ class SIPCall : public Call {
void setContactHeader(pj_str_t *contact); void setContactHeader(pj_str_t *contact);
private: private:
// override of Call::getDetails
std::map<std::string, std::string>
getDetails();
// override of Call::createHistoryEntry // override of Call::createHistoryEntry
std::map<std::string, std::string> std::map<std::string, std::string>
......
...@@ -207,19 +207,6 @@ bool VideoReceiveThread::decodeFrame() ...@@ -207,19 +207,6 @@ bool VideoReceiveThread::decodeFrame()
return false; 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() void VideoReceiveThread::enterConference()
{ {
......
...@@ -54,7 +54,6 @@ public: ...@@ -54,7 +54,6 @@ public:
void addIOContext(SocketPair &socketPair); void addIOContext(SocketPair &socketPair);
void setRequestKeyFrameCallback(void (*)(const std::string &)); void setRequestKeyFrameCallback(void (*)(const std::string &));
void addReceivingDetails(std::map<std::string, std::string> &details);
void enterConference(); void enterConference();
void exitConference(); void exitConference();
......
...@@ -225,13 +225,6 @@ void VideoRtpSession::forceKeyFrame() ...@@ -225,13 +225,6 @@ void VideoRtpSession::forceKeyFrame()
sender_->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() void VideoRtpSession::setupConferenceVideoPipeline()
{ {
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
......
...@@ -62,7 +62,6 @@ public: ...@@ -62,7 +62,6 @@ public:
unsigned int port); unsigned int port);
void updateSDP(const Sdp &sdp); void updateSDP(const Sdp &sdp);
void forceKeyFrame(); void forceKeyFrame();
void addReceivingDetails(std::map<std::string, std::string> &details);
void bindMixer(VideoMixer* mixer); void bindMixer(VideoMixer* mixer);
void unbindMixer(); void unbindMixer();
void setupConferenceVideoPipeline(); void setupConferenceVideoPipeline();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment