From 1e99bf100f57dd33251f7e8d473fdd8fbc63a972 Mon Sep 17 00:00:00 2001 From: Michael Fabian Dirks Date: Thu, 11 May 2017 13:11:05 +0200 Subject: [PATCH] enc-amf: Version 2.1.3 --- UI/window-basic-main-outputs.cpp | 34 ++++++++++++++++---------------- plugins/enc-amf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index 2222fe995..242b90d87 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -565,21 +565,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); } @@ -588,21 +588,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 diff --git a/plugins/enc-amf b/plugins/enc-amf index 9e269d2ef..c3742169c 160000 --- a/plugins/enc-amf +++ b/plugins/enc-amf @@ -1 +1 @@ -Subproject commit 9e269d2ef020d5a25015f27d712d91eacdd17033 +Subproject commit c3742169c90556e52013191c68b5498cd9b888bf