Packman Build Service PMBS

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-0.16.1.tar.xz/UI/obs-app.cpp -> obs-studio-0.16.2.tar.xz/UI/obs-app.cpp Changed

obs-studio-0.16.1.tar.xz/UI/obs-app.hpp -> obs-studio-0.16.2.tar.xz/UI/obs-app.hpp Changed

obs-studio-0.16.1.tar.xz/UI/window-basic-main.cpp -> obs-studio-0.16.2.tar.xz/UI/window-basic-main.cpp Changed

obs-studio-0.16.1.tar.xz/libobs/obs-config.h -> obs-studio-0.16.2.tar.xz/libobs/obs-config.h Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/#Resources/PatchNotes.txt -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/#Resources/PatchNotes.txt Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Include/amd-amf.h -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/amd-amf.h Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Include/enc-h264-simple.h -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/enc-h264-simple.h Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Include/plugin.h -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Include/plugin.h Changed

@@ -21,6 +21,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
+
 #pragma once
 //////////////////////////////////////////////////////////////////////////
 // Includes
@@ -32,6 +33,7 @@
 #include <thread>
 
 // Open Broadcaster Software
+#pragma warning( disable: 4201 )
 #include "libobs/obs-module.h"
 #include "libobs/obs-encoder.h"
 
@@ -44,8 +46,8 @@
 
 #define PLUGIN_VERSION_MAJOR			1
 #define PLUGIN_VERSION_MINOR			3
-#define PLUGIN_VERSION_PATCH			0
-#define PLUGIN_VERSION_BUILD			3
+#define PLUGIN_VERSION_PATCH			1
+#define PLUGIN_VERSION_BUILD			0
 #define PLUGIN_VERSION_FULL				(((uint64_t)PLUGIN_VERSION_MAJOR << 48ull) | ((uint64_t)PLUGIN_VERSION_MINOR << 32ull) | ((uint64_t)PLUGIN_VERSION_PATCH) | ((uint64_t)PLUGIN_VERSION_BUILD))
 #define PLUGIN_VERSION_TEXT				vstr(PLUGIN_VERSION_MAJOR) "." vstr(PLUGIN_VERSION_MINOR) "." vstr(PLUGIN_VERSION_PATCH) "." vstr(PLUGIN_VERSION_BUILD) "-" vstr(AMF_VERSION_MAJOR) "." vstr(AMF_VERSION_MINOR) "." vstr(AMF_VERSION_RELEASE) "." vstr(AMF_VERSION_BUILD_NUM)
 
@@ -70,7 +72,7 @@
 
 #define ThrowExceptionWithAMFError(format, res, ...) {\
 	std::vector<char> _throwexceptionwithamferror_buf(8192);\
-	sprintf(_throwexceptionwithamferror_buf.data(), format, ##__VA_ARGS__, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);\
+	sprintf_s(_throwexceptionwithamferror_buf.data(), _throwexceptionwithamferror_buf.size(), format, ##__VA_ARGS__, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);\
 	AMF_LOG_ERROR("%s", _throwexceptionwithamferror_buf.data()); \
 	throw new std::exception(_throwexceptionwithamferror_buf.data(), res); \
 }

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce-capabilities.cpp -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce-capabilities.cpp Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce.cpp -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/amd-amf-vce.cpp Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264-simple.cpp -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264-simple.cpp Changed

@@ -172,9 +172,9 @@
 	/// Preset
 	list = obs_properties_add_list(props, AMF_H264SIMPLE_PRESET, obs_module_text(AMF_H264SIMPLE_PRESET), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_list_add_int(list, "", -1);
-	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_RECORDING), Preset_Recording);
 	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_TWITCH), Preset_Twitch);
 	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_YOUTUBE), Preset_YouTube);
+	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_RECORDING), Preset_Recording);
 	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_HIGHQUALTIY), Preset_HighQuality);
 	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_INDISTINGUISHABLE), Preset_Indistinguishable);
 	obs_property_list_add_int(list, obs_module_text(AMF_H264SIMPLE_PRESET_LOSSLESS), Preset_Lossless);
@@ -367,23 +367,22 @@
 bool Plugin::Interface::H264SimpleInterface::ui_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data) {
 	if (obs_data_get_int(data, AMF_H264SIMPLE_PRESET) != -1) {
 		switch (obs_data_get_int(data, AMF_H264SIMPLE_PRESET)) {
-			case Preset_Recording: // Recording
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
+			case Preset_Twitch: // Twitch
+				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
 				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
 				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
+				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_41);
+				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
+				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 18);
 				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
+				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 3000);
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+				obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
 				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
 
 				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
+				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
+				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
 				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
 				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
 				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
@@ -393,7 +392,8 @@
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
 				obs_data_set_int(data, AMF_H264_CABAC, -1);
 				break;
-			case Preset_Twitch: // Twitch
+			case Preset_YouTube: // YouTube
+				// Basic Properties
 				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
 				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
 				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
@@ -401,7 +401,7 @@
 				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
 				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 18);
 				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 3000);
+				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 6000);
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
 				obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
 				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
@@ -418,23 +418,23 @@
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_GOP_SIZE, false);
 				obs_data_set_int(data, AMF_H264_CABAC, -1);
 				break;
-			case Preset_YouTube: // YouTube
-				// Basic Properties
-				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 2);
+			case Preset_Recording: // Recording
+				obs_data_set_int(data, AMF_H264SIMPLE_KEYFRAME_INTERVAL, 1);
 				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
 				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
-				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCEProfileLevel_41);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantBitrate);
-				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 18);
+				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
+				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
+				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
 				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
-				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 6000);
+				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
+				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
-				obs_data_set_int(data, AMF_H264_FILLERDATA, 1);
-				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
+				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
+				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 1);
 
 				// Advanced Properties
-				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, 0);
-				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, 0);
+				obs_data_set_int(data, AMF_H264_BPICTURE_PATTERN, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 3 : 0));
+				obs_data_set_int(data, AMF_H264_BPICTURE_REFERENCE, (VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->supportsBFrames ? 1 : 0));
 				obs_data_set_int(data, AMF_H264_QP_BPICTURE_DELTA, 0);
 				obs_data_set_int(data, AMF_H264_QP_REFERENCE_BPICTURE_DELTA, 0);
 				obs_data_set_int(data, AMF_H264_DEBLOCKINGFILTER, 1);
@@ -450,11 +450,14 @@
 				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
 				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
 				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
+				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
 				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
 				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+				obs_data_set_int(data, AMF_H264_QP_IFRAME, 16);
+				obs_data_set_int(data, AMF_H264_QP_PFRAME, 19);
+				obs_data_set_int(data, AMF_H264_QP_BFRAME, 21);
 				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, 20000);
+				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
 				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
 				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
@@ -477,11 +480,14 @@
 				obs_data_set_int(data, AMF_H264_QUALITY_PRESET, VCEQualityPreset_Quality);
 				obs_data_set_int(data, AMF_H264_PROFILE, VCEProfile_High);
 				obs_data_set_int(data, AMF_H264_PROFILELEVEL, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxProfileLevel);
-				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_VariableBitrate_LatencyConstrained);
+				obs_data_set_int(data, AMF_H264_RATECONTROLMETHOD, VCERateControlMethod_ConstantQP);
 				obs_data_set_int(data, AMF_H264_QP_MINIMUM, 0);
-				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 21);
+				obs_data_set_int(data, AMF_H264_QP_MAXIMUM, 51);
+				obs_data_set_int(data, AMF_H264_QP_IFRAME, 11);
+				obs_data_set_int(data, AMF_H264_QP_PFRAME, 14);
+				obs_data_set_int(data, AMF_H264_QP_BFRAME, 16);
 				obs_data_set_int(data, AMF_H264_BITRATE_TARGET, 10000);
-				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, 50000);
+				obs_data_set_int(data, AMF_H264_BITRATE_PEAK, VCECapabilities::GetInstance()->GetEncoderCaps(VCEEncoderType_AVC)->maxBitrate / 1000);
 				obs_data_set_bool(data, AMF_H264SIMPLE_USE_CUSTOM_BUFFER_SIZE, false);
 				obs_data_set_int(data, AMF_H264_FILLERDATA, 0);
 				obs_data_set_int(data, AMF_H264_FRAMESKIPPING, 0);
@@ -530,7 +536,7 @@
 				obs_data_set_int(data, AMF_H264_CABAC, -1);
 				break;
 		}
-		obs_data_set_int(data, AMF_H264SIMPLE_PRESET, -1);
+		//obs_data_set_int(data, AMF_H264SIMPLE_PRESET, -1);
 	}
 
 	{ // Rate Control Settings
@@ -621,6 +627,8 @@
 	}
 }
 
+#pragma warning( push )
+#pragma warning( disable: 4702 )
 void Plugin::Interface::H264SimpleInterface::destroy(void* data) {
 	try {
 		delete (static_cast<Plugin::Interface::H264SimpleInterface*>(data));
@@ -629,14 +637,19 @@
 		AMF_LOG_ERROR("Unable to destroy Encoder, see log for more information.");
 	}
 }
+#pragma warning( pop )
 
+#pragma warning( push )
+#pragma warning( disable: 4702 )
 bool Plugin::Interface::H264SimpleInterface::update(void *data, obs_data_t *settings) {
 	try {
 		return static_cast<Plugin::Interface::H264SimpleInterface*>(data)->update(settings);
 	} catch (...) {
 		AMF_LOG_ERROR("Unable to update Encoder, see log for more information.");
+		return false;
 	}
 }
+#pragma warning( pop )
 
 bool Plugin::Interface::H264SimpleInterface::encode(void *data, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
 	try {
@@ -950,10 +963,13 @@
 	AMF_LOG_INFO("<AMFEncoder::H264SimpleInterface::~H264SimpleInterface> Complete.");
 }
 
+#pragma warning( push )
+#pragma warning( disable: 4100 )
 bool Plugin::Interface::H264SimpleInterface::update(obs_data_t* settings) {
 	// settings is not flagged as a unused here, since a future update may add support for this.
 	return false;
 }
+#pragma warning( pop )
 
 bool Plugin::Interface::H264SimpleInterface::encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet) {
 	bool retVal = true;

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264.cpp -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/Source/enc-h264.cpp Changed

obs-studio-0.16.1.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj -> obs-studio-0.16.2.tar.xz/plugins/enc-amf/enc-amf/enc-amf.vcxproj Changed

@@ -102,7 +102,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
@@ -114,7 +114,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
@@ -127,7 +127,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <FloatingPointExceptions>false</FloatingPointExceptions>
@@ -151,7 +151,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <FloatingPointExceptions>false</FloatingPointExceptions>

obs-studio-0.16.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-0.16.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

obs-studio-0.16.1.tar.xz/plugins/obs-text/data/locale/en-US.ini -> obs-studio-0.16.2.tar.xz/plugins/obs-text/data/locale/en-US.ini Changed

obs-studio-0.16.1.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp -> obs-studio-0.16.2.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp Changed

@@ -42,6 +42,10 @@
 #define S_FILE                          "file"
 #define S_TEXT                          "text"
 #define S_COLOR                         "color"
+#define S_GRADIENT                      "gradient"
+#define S_GRADIENT_COLOR                "gradient_color"
+#define S_GRADIENT_DIR                  "gradient_dir"
+#define S_GRADIENT_OPACITY              "gradient_opacity"
 #define S_ALIGN                         "align"
 #define S_VALIGN                        "valign"
 #define S_OPACITY                       "opacity"
@@ -73,6 +77,10 @@
 #define T_FILE                          T_("TextFile")
 #define T_TEXT                          T_("Text")
 #define T_COLOR                         T_("Color")
+#define T_GRADIENT                      T_("Gradient")
+#define T_GRADIENT_COLOR                T_("Gradient.Color")
+#define T_GRADIENT_DIR                  T_("Gradient.Direction")
+#define T_GRADIENT_OPACITY              T_("Gradient.Opacity")
 #define T_ALIGN                         T_("Alignment")
 #define T_VALIGN                        T_("VerticalAlignment")
 #define T_OPACITY                       T_("Opacity")
@@ -195,11 +203,15 @@
 	wstring face;
 	int face_size = 0;
 	uint32_t color = 0xFFFFFF;
+	uint32_t color2 = 0xFFFFFF;
+	float gradient_dir = 0;
 	uint32_t opacity = 100;
+	uint32_t opacity2 = 100;
 	uint32_t bk_color = 0;
 	uint32_t bk_opacity = 0;
 	Align align = Align::Left;
 	VAlign valign = VAlign::Top;
+	bool gradient = false;
 	bool bold = false;
 	bool italic = false;
 	bool underline = false;
@@ -515,7 +527,10 @@
 			bits.get());
 
 	Graphics graphics_bitmap(&bitmap);
-	SolidBrush brush(Color(get_alpha_val(opacity) | (color & 0xFFFFFF)));
+	LinearGradientBrush brush(RectF(0, 0, (float)size.cx, (float)size.cy),
+			Color(calc_color(color, opacity)),
+			Color(calc_color(color2, opacity2)),
+			gradient_dir, 1);
 	DWORD full_bk_color = bk_color & 0xFFFFFF;
 
 	if (!text.empty() || use_extents)
@@ -625,6 +640,10 @@
 	const char *valign_str = obs_data_get_string(s, S_VALIGN);
 	uint32_t new_color     = obs_data_get_uint32(s, S_COLOR);
 	uint32_t new_opacity   = obs_data_get_uint32(s, S_OPACITY);
+	bool gradient          = obs_data_get_bool(s, S_GRADIENT);
+	uint32_t new_color2    = obs_data_get_uint32(s, S_GRADIENT_COLOR);
+	uint32_t new_opacity2  = obs_data_get_uint32(s, S_GRADIENT_OPACITY);
+	float new_grad_dir     = (float)obs_data_get_double(s, S_GRADIENT_DIR);
 	bool new_vertical      = obs_data_get_bool(s, S_VERTICAL);
 	bool new_outline       = obs_data_get_bool(s, S_OUTLINE);
 	uint32_t new_o_color   = obs_data_get_uint32(s, S_OUTLINE_COLOR);
@@ -674,11 +693,15 @@
 	/* ----------------------------- */
 
 	new_color = rgb_to_bgr(new_color);
+	new_color2 = rgb_to_bgr(new_color2);
 	new_o_color = rgb_to_bgr(new_o_color);
 	new_bk_color = rgb_to_bgr(new_bk_color);
 
 	color = new_color;
 	opacity = new_opacity;
+	color2 = new_color2;
+	opacity2 = new_opacity2;
+	gradient_dir = new_grad_dir;
 	vertical = new_vertical;
 
 	bk_color = new_bk_color;
@@ -688,6 +711,11 @@
 	extents_cx = n_extents_cx;
 	extents_cy = n_extents_cy;
 
+	if (!gradient) {
+		color2 = color;
+		opacity2 = opacity;
+	}
+
 	read_from_file = new_use_file;
 
 	chatlog_mode = new_chat_mode;
@@ -807,6 +835,17 @@
 	return true;
 }
 
+static bool gradient_changed(obs_properties_t *props, obs_property_t *p,
+		obs_data_t *s)
+{
+	bool gradient = obs_data_get_bool(s, S_GRADIENT);
+
+	set_vis(gradient, S_GRADIENT_COLOR, true);
+	set_vis(gradient, S_GRADIENT_OPACITY, true);
+	set_vis(gradient, S_GRADIENT_DIR, true);
+	return true;
+}
+
 static bool extents_modified(obs_properties_t *props, obs_property_t *p,
 		obs_data_t *s)
 {
@@ -855,8 +894,16 @@
 
 	obs_properties_add_bool(props, S_VERTICAL, T_VERTICAL);
 	obs_properties_add_color(props, S_COLOR, T_COLOR);
-
 	obs_properties_add_int_slider(props, S_OPACITY, T_OPACITY, 0, 100, 1);
+
+	p = obs_properties_add_bool(props, S_GRADIENT, T_GRADIENT);
+	obs_property_set_modified_callback(p, gradient_changed);
+
+	obs_properties_add_color(props, S_GRADIENT_COLOR, T_GRADIENT_COLOR);
+	obs_properties_add_int_slider(props, S_GRADIENT_OPACITY,
+			T_GRADIENT_OPACITY, 0, 100, 1);
+	obs_properties_add_float_slider(props, S_GRADIENT_DIR,
+			T_GRADIENT_DIR, 0, 360, 0.1);
 	
 	obs_properties_add_color(props, S_BKCOLOR, T_BKCOLOR);
 	obs_properties_add_int_slider(props, S_BKOPACITY, T_BKOPACITY,
@@ -937,6 +984,9 @@
 		obs_data_set_default_string(settings, S_VALIGN, S_VALIGN_TOP);
 		obs_data_set_default_int(settings, S_COLOR, 0xFFFFFF);
 		obs_data_set_default_int(settings, S_OPACITY, 100);
+		obs_data_set_default_int(settings, S_GRADIENT_COLOR, 0xFFFFFF);
+		obs_data_set_default_int(settings, S_GRADIENT_OPACITY, 100);
+		obs_data_set_default_double(settings, S_GRADIENT_DIR, 90.0);
 		obs_data_set_default_int(settings, S_BKCOLOR, 0x000000);
 		obs_data_set_default_int(settings, S_BKOPACITY, 0);
 		obs_data_set_default_int(settings, S_OUTLINE_SIZE, 2);

Changes of Revision 36