izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix video freezing when resizing display with 2 or more sessions

Browse Source
This commit is contained in:
loki
2020-04-17 19:18:55 +02:00
parent 5a4055f313
commit dd13131fe6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sunshine/video.cpp
View File

@@ -904,7 +904,6 @@ encode_e encode_run_sync(std::vector<std::unique_ptr<sync_session_ctx_t>> &synce
continue; continue;
} }
sws_t sws;
if(pos->img_tmp) { if(pos->img_tmp) {
if(pos->hwdevice->convert(*pos->img_tmp)) { if(pos->hwdevice->convert(*pos->img_tmp)) {
BOOST_LOG(error) << "Could not convert image"sv; BOOST_LOG(error) << "Could not convert image"sv;
@@ -989,6 +988,11 @@ void capture_async(
int key_frame_nr = 1; int key_frame_nr = 1;
while(!shutdown_event->peek() && images->running()) { while(!shutdown_event->peek() && images->running()) {
// Wait for the main capture event when the display is being reinitialized
if(ref->reinit_event.peek()) {
std::this_thread::sleep_for(100ms);
continue;
}
// Wait for the display to be ready // Wait for the display to be ready
std::shared_ptr<platf::display_t> display; std::shared_ptr<platf::display_t> display;
{ {