mirror of
https://github.com/LizardByte/Sunshine.git
synced 2025-08-10 00:52:16 +00:00
fix(video): allow encoder probing when there are no devices at all (#3594)
Some checks failed
CI / GitHub Env Debug (push) Has been cancelled
CI / Setup Release (push) Has been cancelled
CI / Setup Flatpak Matrix (push) Has been cancelled
CI Docker / Check Dockerfiles (push) Has been cancelled
CodeQL / Get language matrix (push) Has been cancelled
localize / Update Localization (push) Has been cancelled
Build GH-Pages / prep (push) Has been cancelled
CI / Linux Flatpak (push) Has been cancelled
CI / Linux ${{ matrix.type }} (--appimage-build, 22.04, AppImage) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (macos, 13) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (macos, 14) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (ubuntu, latest) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (ubuntu, latest, true) (push) Has been cancelled
CI / Windows (push) Has been cancelled
CI Docker / Setup Release (push) Has been cancelled
CI Docker / Docker${{ matrix.tag }} (push) Has been cancelled
CodeQL / Analyze (${{ matrix.name }}) (push) Has been cancelled
Build GH-Pages / call-jekyll-build (push) Has been cancelled
Some checks failed
CI / GitHub Env Debug (push) Has been cancelled
CI / Setup Release (push) Has been cancelled
CI / Setup Flatpak Matrix (push) Has been cancelled
CI Docker / Check Dockerfiles (push) Has been cancelled
CodeQL / Get language matrix (push) Has been cancelled
localize / Update Localization (push) Has been cancelled
Build GH-Pages / prep (push) Has been cancelled
CI / Linux Flatpak (push) Has been cancelled
CI / Linux ${{ matrix.type }} (--appimage-build, 22.04, AppImage) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (macos, 13) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (macos, 14) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (ubuntu, latest) (push) Has been cancelled
CI / Homebrew (${{ matrix.os_name }}-${{ matrix.os_version }}${{ matrix.release == true && ' (Release)' || '' }}) (ubuntu, latest, true) (push) Has been cancelled
CI / Windows (push) Has been cancelled
CI Docker / Setup Release (push) Has been cancelled
CI Docker / Docker${{ matrix.tag }} (push) Has been cancelled
CodeQL / Analyze (${{ matrix.name }}) (push) Has been cancelled
Build GH-Pages / call-jekyll-build (push) Has been cancelled
This commit is contained in:
@@ -810,19 +810,15 @@ namespace display_device {
|
||||
});
|
||||
}
|
||||
|
||||
bool is_any_device_active() {
|
||||
EnumeratedDeviceList enumerate_devices() {
|
||||
std::lock_guard lock {DD_DATA.mutex};
|
||||
if (!DD_DATA.sm_instance) {
|
||||
// Platform is not supported, assume success.
|
||||
return true;
|
||||
// Platform is not supported.
|
||||
return {};
|
||||
}
|
||||
|
||||
return DD_DATA.sm_instance->execute([](auto &settings_iface) {
|
||||
const auto devices {settings_iface.enumAvailableDevices()};
|
||||
// If at least one device has additional info, it is active.
|
||||
return std::any_of(std::begin(devices), std::end(devices), [](const auto &device) {
|
||||
return static_cast<bool>(device.m_info);
|
||||
});
|
||||
return settings_iface.enumAvailableDevices();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -121,14 +121,14 @@ namespace display_device {
|
||||
[[nodiscard]] bool reset_persistence();
|
||||
|
||||
/**
|
||||
* @brief Check if any of the display devices is currently active.
|
||||
* @return True if at least one device is active.
|
||||
* @brief Enumerate the available devices.
|
||||
* @return A list of devices.
|
||||
*
|
||||
* @examples
|
||||
* const auto result = is_any_device_active();
|
||||
* const auto devices = enumerate_devices();
|
||||
* @examples_end
|
||||
*/
|
||||
[[nodiscard]] bool is_any_device_active();
|
||||
[[nodiscard]] EnumeratedDeviceList enumerate_devices();
|
||||
|
||||
/**
|
||||
* @brief A tag structure indicating that configuration parsing has failed.
|
||||
|
||||
@@ -40,6 +40,37 @@ using namespace std::literals;
|
||||
|
||||
namespace video {
|
||||
|
||||
namespace {
|
||||
/**
|
||||
* @brief Check if we can allow probing for the encoders.
|
||||
* @return True if there should be no issues with the probing, false if we should prevent it.
|
||||
*/
|
||||
bool allow_encoder_probing() {
|
||||
const auto devices {display_device::enumerate_devices()};
|
||||
|
||||
// If there are no devices, then either the API is not working correctly or OS does not support the lib.
|
||||
// Either way we should not block the probing in this case as we can't tell what's wrong.
|
||||
if (devices.empty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Since Windows 11 24H2, it is possible that there will be no active devices present
|
||||
// for some reason (probably a bug). Trying to probe encoders in such a state locks/breaks the DXGI
|
||||
// and also the display device for Windows. So we must have at least 1 active device.
|
||||
const bool at_least_one_device_is_active = std::any_of(std::begin(devices), std::end(devices), [](const auto &device) {
|
||||
// If device has additional info, it is active.
|
||||
return static_cast<bool>(device.m_info);
|
||||
});
|
||||
|
||||
if (at_least_one_device_is_active) {
|
||||
return true;
|
||||
}
|
||||
|
||||
BOOST_LOG(error) << "No display devices are active at the moment! Cannot probe the encoders.";
|
||||
return false;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
void free_ctx(AVCodecContext *ctx) {
|
||||
avcodec_free_context(&ctx);
|
||||
}
|
||||
@@ -2550,8 +2581,8 @@ namespace video {
|
||||
}
|
||||
|
||||
int probe_encoders() {
|
||||
if (!display_device::is_any_device_active()) {
|
||||
BOOST_LOG(error) << "No display devices are active at the moment! Cannot probe encoders as this could break Sunshine.";
|
||||
if (!allow_encoder_probing()) {
|
||||
// Error already logged
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user