jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

Revert "video sender: don't block for device params"

Browse Source 
This reverts commit 4ae261fa10.

Crash!!!

Change-Id: Ia6b38ac5bf26a8e3adac56ab846edbb7e1d7e776
This commit is contained in:
Guillaume Roguez
2015-03-18 19:07:49 -04:00
parent 4ae261fa10
commit 45c2dcb392
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/src/media/video/video_rtp_session.cpp
View File

@ -49,8 +49,6 @@ namespace ring { namespace video {
using std::map;
using std::string;
constexpr static auto NEWPARAMS_TIMEOUT = std::chrono::milliseconds(20);
VideoRtpSession::VideoRtpSession(const string &callID,
const DeviceParams& localVideoParams) :
RtpSession(callID), localVideoParams_(localVideoParams)
@ -70,12 +68,12 @@ void VideoRtpSession::startSender()
RING_WARN("Restarting video sender");
}
std::future<DeviceParams> newParams;
if (not conference_) {
videoLocal_ = getVideoCamera();
if (auto input = videoManager.videoInput.lock()) {
std::future<DeviceParams> newParams = input->switchInput(input_);
if (newParams.valid() &&
newParams.wait_for(NEWPARAMS_TIMEOUT) == std::future_status::ready)
newParams = input->switchInput(input_);
if (newParams.valid())
localVideoParams_ = newParams.get();
else
RING_WARN("No valid new video parameters.");