mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-01-01 03:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QSV performance optimization and HEVC hang fix (#786)

Browse Source
This commit is contained in:
Cameron Gutman 2023-01-17 18:12:14 -06:00 committed by GitHub
parent 7f6383833c
commit 1fbbab9df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/video.cpp
View File

@ -75,13 +75,6 @@ enum class profile_hevc_e : int {
main = 1, main = 1,
main_10 = 2, main_10 = 2,
}; };
enum class multiframe_mode_e : int {
mf_default = 0,
mf_disabled = 1,
mf_auto = 2,
mf_manual = 3,
};
} // namespace qsv } // namespace qsv
@ -262,6 +255,7 @@ enum flag_e {
SINGLE_SLICE_ONLY = 0x08, // Never use multiple slices <-- Older intel iGPU's ruin it for everyone else :P SINGLE_SLICE_ONLY = 0x08, // Never use multiple slices <-- Older intel iGPU's ruin it for everyone else :P
CBR_WITH_VBR = 0x10, // Use a VBR rate control mode to simulate CBR CBR_WITH_VBR = 0x10, // Use a VBR rate control mode to simulate CBR
RELAXED_COMPLIANCE = 0x20, // Use FF_COMPLIANCE_UNOFFICIAL compliance mode RELAXED_COMPLIANCE = 0x20, // Use FF_COMPLIANCE_UNOFFICIAL compliance mode
NO_RC_BUF_LIMIT = 0x40, // Don't set rc_buffer_size
}; };
struct encoder_t { struct encoder_t {
@ -494,11 +488,9 @@ static encoder_t quicksync {
{ "forced_idr"s, 1 }, { "forced_idr"s, 1 },
{ "async_depth"s, 1 }, { "async_depth"s, 1 },
{ "low_delay_brc"s, 1 }, { "low_delay_brc"s, 1 },
{ "low_power"s, 1 },
{ "recovery_point_sei"s, 0 }, { "recovery_point_sei"s, 0 },
{ "vcm"s, 1 },
{ "pic_timing_sei"s, 0 }, { "pic_timing_sei"s, 0 },
{ "max_dec_frame_buffering"s, 1 },
{ "mfmode"s, (int)qsv::multiframe_mode_e::mf_disabled },
}, },
// SDR-specific options // SDR-specific options
{ {
@ -519,11 +511,11 @@ static encoder_t quicksync {
{ "forced_idr"s, 1 }, { "forced_idr"s, 1 },
{ "async_depth"s, 1 }, { "async_depth"s, 1 },
{ "low_delay_brc"s, 1 }, { "low_delay_brc"s, 1 },
{ "low_power"s, 1 },
{ "recovery_point_sei"s, 0 }, { "recovery_point_sei"s, 0 },
{ "vcm"s, 1 }, { "vcm"s, 1 },
{ "pic_timing_sei"s, 0 }, { "pic_timing_sei"s, 0 },
{ "max_dec_frame_buffering"s, 1 }, { "max_dec_frame_buffering"s, 1 },
{ "mfmode"s, (int)qsv::multiframe_mode_e::mf_disabled },
}, },
// SDR-specific options // SDR-specific options
{ {
@ -533,7 +525,7 @@ static encoder_t quicksync {
std::make_optional<encoder_t::option_t>({ "qp"s, &config::video.qp }), std::make_optional<encoder_t::option_t>({ "qp"s, &config::video.qp }),
"h264_qsv"s, "h264_qsv"s,
}, },
PARALLEL_ENCODING | CBR_WITH_VBR | RELAXED_COMPLIANCE, PARALLEL_ENCODING | CBR_WITH_VBR | RELAXED_COMPLIANCE | NO_RC_BUF_LIMIT,
dxgi_make_hwdevice_ctx, dxgi_make_hwdevice_ctx,
}; };
@ -1141,15 +1133,17 @@ std::optional<session_t> make_session(const encoder_t &encoder, const config_t &
ctx->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL; ctx->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL;
} }
if(!hardware && (ctx->slices > 1 || config.videoFormat != 0)) { if(!(encoder.flags & NO_RC_BUF_LIMIT)) {
// Use a larger rc_buffer_size for software encoding when slices are enabled, if(!hardware && (ctx->slices > 1 || config.videoFormat != 0)) {
// because libx264 can severely degrade quality if the buffer is too small. // Use a larger rc_buffer_size for software encoding when slices are enabled,
// libx265 encounters this issue more frequently, so always scale the // because libx264 can severely degrade quality if the buffer is too small.
// buffer by 1.5x for software HEVC encoding. // libx265 encounters this issue more frequently, so always scale the
ctx->rc_buffer_size = bitrate / ((config.framerate * 10) / 15); // buffer by 1.5x for software HEVC encoding.
} ctx->rc_buffer_size = bitrate / ((config.framerate * 10) / 15);
else { }
ctx->rc_buffer_size = bitrate / config.framerate; else {
ctx->rc_buffer_size = bitrate / config.framerate;
}
} }
} }
else if(video_format.qp) { else if(video_format.qp) {