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

Merge pull request #912 from Xaymar/feature-enc-amf

Browse Source 
enc-amf: Version 2.1.3
This commit is contained in:
Jim 2017-05-14 21:02:02 -07:00 committed by GitHub
commit b5a6e12219
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,21 +566,21 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings,
int bitrate)
{
// Static Properties
obs_data_set_int(settings, "AMF.H264.Usage", 0);
obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
obs_data_set_int(settings, "Usage", 0);
obs_data_set_int(settings, "Profile", 100); // High
obs_data_set_string(settings, "profile", "high"); // High
// Rate Control Properties
obs_data_set_int(settings, "AMF.H264.RateControlMethod", 1);
obs_data_set_int(settings, "RateControlMethod", 1);
obs_data_set_string(settings, "rate_control", "CBR");
obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate);
obs_data_set_int(settings, "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", 1);
obs_data_set_int(settings, "AMF.H264.VBVBuffer.Size", bitrate);
obs_data_set_int(settings, "FillerData", 1);
obs_data_set_int(settings, "VBVBuffer", 1);
obs_data_set_int(settings, "VBVBuffer.Size", bitrate);
// Picture Control Properties
obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
obs_data_set_double(settings, "KeyframeInterval", 2.0);
obs_data_set_int(settings, "keyint_sec", 2);
}
@ -589,21 +589,21 @@ void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp)
obs_data_t *settings = obs_data_create();
// Static Properties
obs_data_set_int(settings, "AMF.H264.Usage", 0);
obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
obs_data_set_int(settings, "Usage", 0);
obs_data_set_int(settings, "Profile", 100); // High
obs_data_set_string(settings, "profile", "high"); // High
// Rate Control Properties
obs_data_set_int(settings, "AMF.H264.RateControlMethod", 0);
obs_data_set_int(settings, "RateControlMethod", 0);
obs_data_set_string(settings, "rate_control", "CQP");
obs_data_set_int(settings, "AMF.H264.QP.IFrame", cqp);
obs_data_set_int(settings, "AMF.H264.QP.PFrame", cqp);
obs_data_set_int(settings, "AMF.H264.QP.BFrame", cqp);
obs_data_set_int(settings, "AMF.H264.VBVBuffer", 1);
obs_data_set_int(settings, "AMF.H264.VBVBuffer.Size", 50000);
obs_data_set_int(settings, "QP.IFrame", cqp);
obs_data_set_int(settings, "QP.PFrame", cqp);
obs_data_set_int(settings, "QP.BFrame", cqp);
obs_data_set_int(settings, "VBVBuffer", 1);
obs_data_set_int(settings, "VBVBuffer.Size", 100000);
// Picture Control Properties
obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
obs_data_set_double(settings, "KeyframeInterval", 2.0);
obs_data_set_int(settings, "keyint_sec", 2);
// Update and release

2
plugins/enc-amf

@ -1 +1 @@
Subproject commit 9e269d2ef020d5a25015f27d712d91eacdd17033
Subproject commit c3742169c90556e52013191c68b5498cd9b888bf