From 949400118e6ada8e69fd8b071ed6d3f9ee93d8bf Mon Sep 17 00:00:00 2001 From: Michael Fabian Dirks Date: Thu, 17 Nov 2016 04:40:49 +0100 Subject: [PATCH] UI: Update settings and fix presets for simple AMD encoder --- UI/window-basic-main-outputs.cpp | 6 +----- UI/window-basic-settings.cpp | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index dac83b6b1..7bae3a29d 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -505,7 +505,6 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings, obs_data_set_int(settings, "AMF.H264.Usage", 0); obs_data_set_int(settings, "AMF.H264.Profile", 100); // High obs_data_set_string(settings, "profile", "high"); // High - obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic // Rate Control Properties obs_data_set_int(settings, "AMF.H264.RateControlMethod", 1); @@ -513,8 +512,6 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings, obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate); obs_data_set_int(settings, "bitrate", bitrate); obs_data_set_int(settings, "AMF.H264.FillerData", 1); - obs_data_set_int(settings, "AMF.H264.VBVBuffer", 0); // Automatic VBV Buffer - obs_data_set_double(settings, "AMF.H264.VBVBuffer.Strictness", 0.9); // Picture Control Properties obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0); @@ -529,9 +526,8 @@ void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp) obs_data_set_int(settings, "AMF.H264.Usage", 0); obs_data_set_int(settings, "AMF.H264.Profile", 100); // High obs_data_set_string(settings, "profile", "high"); // High - obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic - // Rate Control Properties + // Rate Control Properties obs_data_set_int(settings, "AMF.H264.RateControlMethod", 0); obs_data_set_string(settings, "rate_control", "CQP"); obs_data_set_int(settings, "AMF.H264.QP.IFrame", cqp); diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 7e94a6aa4..7821166f5 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -1206,6 +1206,8 @@ void OBSBasicSettings::LoadSimpleOutputSettings() "QSVPreset"); const char *nvPreset = config_get_string(main->Config(), "SimpleOutput", "NVENCPreset"); + const char* amdPreset = config_get_string(main->Config(), "SimpleOutput", + "AMDPreset"); const char *custom = config_get_string(main->Config(), "SimpleOutput", "x264Settings"); const char *recQual = config_get_string(main->Config(), "SimpleOutput", @@ -1218,6 +1220,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings() curPreset = preset; curQSVPreset = qsvPreset; curNVENCPreset = nvPreset; + curAMDPreset = amdPreset; audioBitrate = FindClosestAvailableAACBitrate(audioBitrate);