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

Avoid unnecessary encoder probing during startup and launch

Browse Source
This commit is contained in:
Cameron Gutman
2023-04-14 18:19:58 -05:00
parent 8f74c3b482
commit d973e5bbc7
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video.cpp
+6 -28
View File
@@ -277,8 +277,6 @@ namespace video {
enum flag_e { enum flag_e {
PASSED, // Is supported PASSED, // Is supported
REF_FRAMES_RESTRICT, // Set maximum reference frames REF_FRAMES_RESTRICT, // Set maximum reference frames
REF_FRAMES_AUTOSELECT, // Allow encoder to select maximum reference frames (If !REF_FRAMES_RESTRICT --> REF_FRAMES_AUTOSELECT)
SLICE, // Allow frame to be partitioned into multiple slices
CBR, // Some encoders don't support CBR, if not supported --> attempt constant quantatication parameter instead CBR, // Some encoders don't support CBR, if not supported --> attempt constant quantatication parameter instead
DYNAMIC_RANGE, // hdr DYNAMIC_RANGE, // hdr
VUI_PARAMETERS, // AMD encoder with VAAPI doesn't add VUI parameters to SPS VUI_PARAMETERS, // AMD encoder with VAAPI doesn't add VUI parameters to SPS
@@ -294,8 +292,6 @@ namespace video {
switch (flag) { switch (flag) {
_CONVERT(PASSED); _CONVERT(PASSED);
_CONVERT(REF_FRAMES_RESTRICT); _CONVERT(REF_FRAMES_RESTRICT);
_CONVERT(REF_FRAMES_AUTOSELECT);
_CONVERT(SLICE);
_CONVERT(CBR); _CONVERT(CBR);
_CONVERT(DYNAMIC_RANGE); _CONVERT(DYNAMIC_RANGE);
_CONVERT(VUI_PARAMETERS); _CONVERT(VUI_PARAMETERS);
@@ -1222,7 +1218,7 @@ namespace video {
ctx->slices = std::max(config.slicesPerFrame, config::video.min_threads); ctx->slices = std::max(config.slicesPerFrame, config::video.min_threads);
} }
if (!video_format[encoder_t::SLICE]) { if (encoder.flags & SINGLE_SLICE_ONLY) {
ctx->slices = 1; ctx->slices = 1;
} }
@@ -1870,17 +1866,14 @@ namespace video {
encoder.h264.capabilities.set(); encoder.h264.capabilities.set();
encoder.hevc.capabilities.set(); encoder.hevc.capabilities.set();
encoder.hevc[encoder_t::PASSED] = test_hevc;
// First, test encoder viability // First, test encoder viability
config_t config_max_ref_frames { 1920, 1080, 60, 1000, 1, 1, 1, 0, 0 }; config_t config_max_ref_frames { 1920, 1080, 60, 1000, 1, 1, 1, 0, 0 };
config_t config_autoselect { 1920, 1080, 60, 1000, 1, 0, 1, 0, 0 }; config_t config_autoselect { 1920, 1080, 60, 1000, 1, 0, 1, 0, 0 };
retry: retry:
auto max_ref_frames_h264 = validate_config(disp, encoder, config_max_ref_frames); auto max_ref_frames_h264 = validate_config(disp, encoder, config_max_ref_frames);
auto autoselect_h264 = validate_config(disp, encoder, config_autoselect); auto autoselect_h264 = max_ref_frames_h264 >= 0 ? max_ref_frames_h264 : validate_config(disp, encoder, config_autoselect);
if (autoselect_h264 < 0) {
if (max_ref_frames_h264 < 0 && autoselect_h264 < 0) {
if (encoder.h264.qp && encoder.h264[encoder_t::CBR]) { if (encoder.h264.qp && encoder.h264[encoder_t::CBR]) {
// It's possible the encoder isn't accepting Constant Bit Rate. Turn off CBR and make another attempt // It's possible the encoder isn't accepting Constant Bit Rate. Turn off CBR and make another attempt
encoder.h264.capabilities.set(); encoder.h264.capabilities.set();
@@ -1900,20 +1893,16 @@ namespace video {
} }
encoder.h264[encoder_t::REF_FRAMES_RESTRICT] = max_ref_frames_h264 >= 0; encoder.h264[encoder_t::REF_FRAMES_RESTRICT] = max_ref_frames_h264 >= 0;
encoder.h264[encoder_t::REF_FRAMES_AUTOSELECT] = autoselect_h264 >= 0;
encoder.h264[encoder_t::PASSED] = true; encoder.h264[encoder_t::PASSED] = true;
encoder.h264[encoder_t::SLICE] = validate_config(disp, encoder, config_max_ref_frames);
if (test_hevc) { if (test_hevc) {
config_max_ref_frames.videoFormat = 1; config_max_ref_frames.videoFormat = 1;
config_autoselect.videoFormat = 1; config_autoselect.videoFormat = 1;
retry_hevc: retry_hevc:
auto max_ref_frames_hevc = validate_config(disp, encoder, config_max_ref_frames); auto max_ref_frames_hevc = validate_config(disp, encoder, config_max_ref_frames);
auto autoselect_hevc = validate_config(disp, encoder, config_autoselect); auto autoselect_hevc = max_ref_frames_hevc >= 0 ? max_ref_frames_hevc : validate_config(disp, encoder, config_autoselect);
if (autoselect_hevc < 0) {
// If HEVC must be supported, but it is not supported
if (max_ref_frames_hevc < 0 && autoselect_hevc < 0) {
if (encoder.hevc.qp && encoder.hevc[encoder_t::CBR]) { if (encoder.hevc.qp && encoder.hevc[encoder_t::CBR]) {
// It's possible the encoder isn't accepting Constant Bit Rate. Turn off CBR and make another attempt // It's possible the encoder isn't accepting Constant Bit Rate. Turn off CBR and make another attempt
encoder.hevc.capabilities.set(); encoder.hevc.capabilities.set();
@@ -1921,6 +1910,7 @@ namespace video {
goto retry_hevc; goto retry_hevc;
} }
// If HEVC must be supported, but it is not supported
if (force_hevc) { if (force_hevc) {
return false; return false;
} }
@@ -1931,8 +1921,6 @@ namespace video {
} }
encoder.hevc[encoder_t::REF_FRAMES_RESTRICT] = max_ref_frames_hevc >= 0; encoder.hevc[encoder_t::REF_FRAMES_RESTRICT] = max_ref_frames_hevc >= 0;
encoder.hevc[encoder_t::REF_FRAMES_AUTOSELECT] = autoselect_hevc >= 0;
encoder.hevc[encoder_t::PASSED] = max_ref_frames_hevc >= 0 || autoselect_hevc >= 0; encoder.hevc[encoder_t::PASSED] = max_ref_frames_hevc >= 0 || autoselect_hevc >= 0;
} }
@@ -1940,11 +1928,6 @@ namespace video {
{ encoder_t::DYNAMIC_RANGE, { 1920, 1080, 60, 1000, 1, 0, 3, 1, 1 } }, { encoder_t::DYNAMIC_RANGE, { 1920, 1080, 60, 1000, 1, 0, 3, 1, 1 } },
}; };
if (!(encoder.flags & SINGLE_SLICE_ONLY)) {
configs.emplace_back(
std::pair<encoder_t::flag_e, config_t> { encoder_t::SLICE, { 1920, 1080, 60, 1000, 2, 1, 1, 0, 0 } });
}
for (auto &[flag, config] : configs) { for (auto &[flag, config] : configs) {
auto h264 = config; auto h264 = config;
auto hevc = config; auto hevc = config;
@@ -1960,11 +1943,6 @@ namespace video {
} }
} }
if (encoder.flags & SINGLE_SLICE_ONLY) {
encoder.h264.capabilities[encoder_t::SLICE] = false;
encoder.hevc.capabilities[encoder_t::SLICE] = false;
}
encoder.h264[encoder_t::VUI_PARAMETERS] = encoder.h264[encoder_t::VUI_PARAMETERS] && !config::sunshine.flags[config::flag::FORCE_VIDEO_HEADER_REPLACE]; encoder.h264[encoder_t::VUI_PARAMETERS] = encoder.h264[encoder_t::VUI_PARAMETERS] && !config::sunshine.flags[config::flag::FORCE_VIDEO_HEADER_REPLACE];
encoder.hevc[encoder_t::VUI_PARAMETERS] = encoder.hevc[encoder_t::VUI_PARAMETERS] && !config::sunshine.flags[config::flag::FORCE_VIDEO_HEADER_REPLACE]; encoder.hevc[encoder_t::VUI_PARAMETERS] = encoder.hevc[encoder_t::VUI_PARAMETERS] && !config::sunshine.flags[config::flag::FORCE_VIDEO_HEADER_REPLACE];