jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #697 from Xaymar/feature_amd-encoder 

enc-amf: Update to 1.4.2.2 and fix preset and settings in simple mode
master
Jim 2016-11-16 20:49:01 -08:00 committed by GitHub
parent 90e805ad9b 1e9ace42af
commit b8aaab0040
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-main-outputs.cpp
View File

@ -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);

3
UI/window-basic-settings.cpp
View File

@ -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);

2
plugins/enc-amf

@ -1 +1 @@
Subproject commit a35691e51cbe19c50e2c911b4bfbea602dc3edca
Subproject commit b3e2a98ddaa2aca3ead85209e33a1583601add00