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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yukino Song
2024-10-09 02:24:15 +08:00
parent d511cf6482 dff1cd48d4
commit e8862ad77b
9 changed files with 385 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video.cpp
View File

@@ -513,6 +513,7 @@ namespace video {
{ "delay"s, 0 },
{ "forced-idr"s, 1 },
{ "zerolatency"s, 1 },
{ "surfaces"s, 1 },
{ "preset"s, &config::video.nv_legacy.preset },
{ "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY },
{ "rc"s, NV_ENC_PARAMS_RC_CBR },
@@ -533,6 +534,7 @@ namespace video {
{ "delay"s, 0 },
{ "forced-idr"s, 1 },
{ "zerolatency"s, 1 },
{ "surfaces"s, 1 },
{ "preset"s, &config::video.nv_legacy.preset },
{ "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY },
{ "rc"s, NV_ENC_PARAMS_RC_CBR },
@@ -558,6 +560,7 @@ namespace video {
{ "delay"s, 0 },
{ "forced-idr"s, 1 },
{ "zerolatency"s, 1 },
{ "surfaces"s, 1 },
{ "preset"s, &config::video.nv_legacy.preset },
{ "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY },
{ "rc"s, NV_ENC_PARAMS_RC_CBR },
@@ -698,6 +701,9 @@ namespace video {
// Common options
{
{ "filler_data"s, false },
{ "forced_idr"s, 1 },
{ "latency"s, "lowest_latency"s },
{ "skip_frame"s, 0 },
{ "log_to_dbg"s, []() { return config::sunshine.min_log_level < 2 ? 1 : 0; } },
{ "preencode"s, &config::video.amd.amd_preanalysis },
{ "quality"s, &config::video.amd.amd_quality_av1 },
@@ -717,12 +723,13 @@ namespace video {
// Common options
{
{ "filler_data"s, false },
{ "forced_idr"s, 1 },
{ "latency"s, 1 },
{ "skip_frame"s, 0 },
{ "log_to_dbg"s, []() { return config::sunshine.min_log_level < 2 ? 1 : 0; } },
{ "gops_per_idr"s, 1 },
{ "header_insertion_mode"s, "idr"s },
{ "preencode"s, &config::video.amd.amd_preanalysis },
{ "qmax"s, 51 },
{ "qmin"s, 0 },
{ "quality"s, &config::video.amd.amd_quality_hevc },
{ "rc"s, &config::video.amd.amd_rc_hevc },
{ "usage"s, &config::video.amd.amd_usage_hevc },
@@ -741,10 +748,11 @@ namespace video {
// Common options
{
{ "filler_data"s, false },
{ "forced_idr"s, 1 },
{ "latency"s, 1 },
{ "frame_skipping"s, 0 },
{ "log_to_dbg"s, []() { return config::sunshine.min_log_level < 2 ? 1 : 0; } },
{ "preencode"s, &config::video.amd.amd_preanalysis },
{ "qmax"s, 51 },
{ "qmin"s, 0 },
{ "quality"s, &config::video.amd.amd_quality_h264 },
{ "rc"s, &config::video.amd.amd_rc_h264 },
{ "usage"s, &config::video.amd.amd_usage_h264 },
@@ -923,6 +931,7 @@ namespace video {
{ "require_sw"s, &config::video.vt.vt_require_sw },
{ "realtime"s, &config::video.vt.vt_realtime },
{ "prio_speed"s, 1 },
{ "max_ref_frames"s, 1 },
},
{}, // SDR-specific options
{}, // HDR-specific options
@@ -939,6 +948,7 @@ namespace video {
{ "require_sw"s, &config::video.vt.vt_require_sw },
{ "realtime"s, &config::video.vt.vt_realtime },
{ "prio_speed"s, 1 },
{ "max_ref_frames"s, 1 },
},
{}, // SDR-specific options
{}, // HDR-specific options
@@ -955,6 +965,7 @@ namespace video {
{ "require_sw"s, &config::video.vt.vt_require_sw },
{ "realtime"s, &config::video.vt.vt_realtime },
{ "prio_speed"s, 1 },
{ "max_ref_frames"s, 1 },
},
{}, // SDR-specific options
{}, // HDR-specific options