mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2024-11-18 20:09:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add warning to ignore errors during encoder validation

Browse Source
This commit is contained in:
loki 2021-05-12 23:22:13 +02:00
parent 9e48e58221
commit 1050978246
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sunshine/main.cpp
View File

@ -15,7 +15,6 @@
#include <boost/log/attributes/clock.hpp> #include <boost/log/attributes/clock.hpp>
#include "video.h" #include "video.h"
#include "input.h"
#include "nvhttp.h" #include "nvhttp.h"
#include "rtsp.h" #include "rtsp.h"
#include "config.h" #include "config.h"
@ -142,7 +141,6 @@ int main(int argc, char *argv[]) {
return 4; return 4;
} }
input::init();
reed_solomon_init(); reed_solomon_init();
if(video::init()) { if(video::init()) {
return 2; return 2;

24
sunshine/video.cpp
View File

@ -1146,6 +1146,11 @@ bool validate_config(std::shared_ptr<platf::display_t> &disp, const encoder_t &e
bool validate_encoder(encoder_t &encoder) { bool validate_encoder(encoder_t &encoder) {
std::shared_ptr<platf::display_t> disp; std::shared_ptr<platf::display_t> disp;
BOOST_LOG(info) << "Trying encoder ["sv << encoder.name << ']';
auto fg = util::fail_guard([&]() {
BOOST_LOG(info) << "Encoder ["sv << encoder.name << "] failed"sv;
});
auto force_hevc = config::video.hevc_mode >= 2; auto force_hevc = config::video.hevc_mode >= 2;
auto test_hevc = force_hevc || (config::video.hevc_mode == 0 && encoder.hevc_mode); auto test_hevc = force_hevc || (config::video.hevc_mode == 0 && encoder.hevc_mode);
@ -1200,10 +1205,21 @@ bool validate_encoder(encoder_t &encoder) {
} }
} }
fg.disable();
return true; return true;
} }
int init() { int init() {
// video depends on input for input::touch_port_event
input::init();
BOOST_LOG(info) << "//////////////////////////////////////////////////////////////////"sv;
BOOST_LOG(info) << "// //"sv;
BOOST_LOG(info) << "// Testing for available encoders, this may generate errors. //"sv;
BOOST_LOG(info) << "// You can safely ignore those errors. //"sv;
BOOST_LOG(info) << "// //"sv;
BOOST_LOG(info) << "//////////////////////////////////////////////////////////////////"sv;
KITTY_WHILE_LOOP(auto pos = std::begin(encoders), pos != std::end(encoders), { KITTY_WHILE_LOOP(auto pos = std::begin(encoders), pos != std::end(encoders), {
if( if(
(!config::video.encoder.empty() && pos->name != config::video.encoder) || (!config::video.encoder.empty() && pos->name != config::video.encoder) ||
@ -1229,6 +1245,14 @@ int init() {
return -1; return -1;
} }
BOOST_LOG(info);
BOOST_LOG(info) << "//////////////////////////////////////////////////////////////"sv;
BOOST_LOG(info) << "// //"sv;
BOOST_LOG(info) << "// Ignore any errors mentioned above, they are not relevant //"sv;
BOOST_LOG(info) << "// //"sv;
BOOST_LOG(info) << "//////////////////////////////////////////////////////////////"sv;
BOOST_LOG(info);
auto &encoder = encoders.front(); auto &encoder = encoders.front();
if(encoder.hevc[encoder_t::PASSED]) { if(encoder.hevc[encoder_t::PASSED]) {
BOOST_LOG(info) << "Found encoder "sv << encoder.name << ": ["sv << encoder.h264.name << ", "sv << encoder.hevc.name << ']'; BOOST_LOG(info) << "Found encoder "sv << encoder.name << ": ["sv << encoder.h264.name << ", "sv << encoder.hevc.name << ']';