Skip to content
Snippets Groups Projects
Commit 45c2dcb3 authored by Guillaume Roguez's avatar Guillaume Roguez
Browse files

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

This reverts commit 4ae261fa.

Crash!!!

Change-Id: Ia6b38ac5bf26a8e3adac56ab846edbb7e1d7e776
parent 4ae261fa
No related branches found
No related tags found
No related merge requests found
...@@ -49,8 +49,6 @@ namespace ring { namespace video { ...@@ -49,8 +49,6 @@ namespace ring { namespace video {
using std::map; using std::map;
using std::string; using std::string;
constexpr static auto NEWPARAMS_TIMEOUT = std::chrono::milliseconds(20);
VideoRtpSession::VideoRtpSession(const string &callID, VideoRtpSession::VideoRtpSession(const string &callID,
const DeviceParams& localVideoParams) : const DeviceParams& localVideoParams) :
RtpSession(callID), localVideoParams_(localVideoParams) RtpSession(callID), localVideoParams_(localVideoParams)
...@@ -70,12 +68,12 @@ void VideoRtpSession::startSender() ...@@ -70,12 +68,12 @@ void VideoRtpSession::startSender()
RING_WARN("Restarting video sender"); RING_WARN("Restarting video sender");
} }
std::future<DeviceParams> newParams;
if (not conference_) { if (not conference_) {
videoLocal_ = getVideoCamera(); videoLocal_ = getVideoCamera();
if (auto input = videoManager.videoInput.lock()) { if (auto input = videoManager.videoInput.lock()) {
std::future<DeviceParams> newParams = input->switchInput(input_); newParams = input->switchInput(input_);
if (newParams.valid() && if (newParams.valid())
newParams.wait_for(NEWPARAMS_TIMEOUT) == std::future_status::ready)
localVideoParams_ = newParams.get(); localVideoParams_ = newParams.get();
else else
RING_WARN("No valid new video parameters."); RING_WARN("No valid new video parameters.");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment