浏览代码

Merge pull request #826 from Xaymar/feature_amd-encoder

UI, enc-amf: Update AMD Encoder
Jim 8 年之前
父节点
当前提交
95fe16534d
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 0
      UI/window-basic-main-outputs.cpp
  2. 1 1
      plugins/enc-amf

+ 4 - 0
UI/window-basic-main-outputs.cpp

@@ -575,6 +575,8 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings,
 	obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate);
 	obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate);
 	obs_data_set_int(settings, "bitrate", bitrate);
 	obs_data_set_int(settings, "bitrate", bitrate);
 	obs_data_set_int(settings, "AMF.H264.FillerData", 1);
 	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);
 	
 	
 	// Picture Control Properties
 	// Picture Control Properties
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
@@ -596,6 +598,8 @@ void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp)
 	obs_data_set_int(settings, "AMF.H264.QP.IFrame", 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.PFrame", cqp);
 	obs_data_set_int(settings, "AMF.H264.QP.BFrame", 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);
 
 
 	// Picture Control Properties
 	// Picture Control Properties
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);

+ 1 - 1
plugins/enc-amf

@@ -1 +1 @@
-Subproject commit 8648badf4293b75106d018329b61a290fe8bb90b
+Subproject commit 4c2d0d6993fe02f8d037118059cd3d698f8e61aa