jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't fail kmsgrab init entirely if a single card doesn't work

Browse source
This commit is contained in:
Cameron Gutman 2024-01-03 00:03:32 -06:00
commit 43992e7e9b
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/platform/linux/kmsgrab.cpp
View file

@ -522,7 +522,7 @@ namespace platf {
kms::card_t card; kms::card_t card;
if (card.init(entry.path().c_str())) { if (card.init(entry.path().c_str())) {
return {}; continue;
} }
auto end = std::end(card); auto end = std::end(card);
@ -560,6 +560,12 @@ namespace platf {
} }
} }
auto crtc = card.crtc(plane->crtc_id);
if (!crtc) {
BOOST_LOG(error) << "Couldn't get CRTC info: "sv << strerror(errno);
continue;
}
BOOST_LOG(info) << "Found monitor for DRM screencasting"sv; BOOST_LOG(info) << "Found monitor for DRM screencasting"sv;
// We need to find the correct /dev/dri/card{nr} to correlate the crtc_id with the monitor descriptor // We need to find the correct /dev/dri/card{nr} to correlate the crtc_id with the monitor descriptor
@ -576,13 +582,12 @@ namespace platf {
// TODO: surf_sd = fb->to_sd(); // TODO: surf_sd = fb->to_sd();
auto crct = card.crtc(plane->crtc_id); kms::print(plane.get(), fb.get(), crtc.get());
kms::print(plane.get(), fb.get(), crct.get());
img_width = fb->width; img_width = fb->width;
img_height = fb->height; img_height = fb->height;
img_offset_x = crct->x; img_offset_x = crtc->x;
img_offset_y = crct->y; img_offset_y = crtc->y;
this->env_width = ::platf::kms::env_width; this->env_width = ::platf::kms::env_width;
this->env_height = ::platf::kms::env_height; this->env_height = ::platf::kms::env_height;
@ -614,10 +619,10 @@ namespace platf {
// crtc_to_monitor is part of the guesswork after all. // crtc_to_monitor is part of the guesswork after all.
else { else {
BOOST_LOG(warning) << "Couldn't find crtc_id, this shouldn't have happened :\\"sv; BOOST_LOG(warning) << "Couldn't find crtc_id, this shouldn't have happened :\\"sv;
width = crct->width; width = crtc->width;
height = crct->height; height = crtc->height;
offset_x = crct->x; offset_x = crtc->x;
offset_y = crct->y; offset_y = crtc->y;
} }
this->card = std::move(card); this->card = std::move(card);
@ -1112,7 +1117,7 @@ namespace platf {
kms::card_t card; kms::card_t card;
if (card.init(entry.path().c_str())) { if (card.init(entry.path().c_str())) {
return {}; continue;
} }
auto crtc_to_monitor = kms::map_crtc_to_monitor(card.monitors(conn_type_count)); auto crtc_to_monitor = kms::map_crtc_to_monitor(card.monitors(conn_type_count));
@ -1138,8 +1143,8 @@ namespace platf {
// This appears to return the offset of the monitor // This appears to return the offset of the monitor
auto crtc = card.crtc(plane->crtc_id); auto crtc = card.crtc(plane->crtc_id);
if (!crtc) { if (!crtc) {
BOOST_LOG(error) << "Couldn't get crtc info: "sv << strerror(errno); BOOST_LOG(error) << "Couldn't get CRTC info: "sv << strerror(errno);
return {}; continue;
} }
auto it = crtc_to_monitor.find(plane->crtc_id); auto it = crtc_to_monitor.find(plane->crtc_id);