Revert "obs-filters: Remove duplicate code from color key filter"

This reverts commit a4045ed31aee67649e71d10e2793b39677ce2c04.

plugins/obs-filters/color-key-filter.c

@@ -31,7 +31,6 @@ struct color_key_filter_data {
 	gs_effect_t *effect;
 
 	gs_eparam_t *color_param;
-	gs_eparam_t *opacity_param;
 	gs_eparam_t *contrast_param;
 	gs_eparam_t *brightness_param;
 	gs_eparam_t *gamma_param;
@@ -41,6 +40,29 @@ struct color_key_filter_data {
 	gs_eparam_t *smoothness_param;
 
 	struct vec4 color;
+	float contrast;
+	float brightness;
+	float gamma;
+
+	struct vec4 key_color;
+	float similarity;
+	float smoothness;
+};
+
+struct color_key_filter_data_v2 {
+	obs_source_t *context;
+
+	gs_effect_t *effect;
+
+	gs_eparam_t *opacity_param;
+	gs_eparam_t *contrast_param;
+	gs_eparam_t *brightness_param;
+	gs_eparam_t *gamma_param;
+
+	gs_eparam_t *key_color_param;
+	gs_eparam_t *similarity_param;
+	gs_eparam_t *smoothness_param;
+
 	float opacity;
 	float contrast;
 	float brightness;
@@ -57,21 +79,36 @@ static const char *color_key_name(void *unused)
 	return obs_module_text("ColorKeyFilter");
 }
 
-static inline void color_settings_update(struct color_key_filter_data *filter,
-					 obs_data_t *settings)
+static inline void
+color_settings_update_v1(struct color_key_filter_data *filter,
+			 obs_data_t *settings)
 {
-	uint32_t version = obs_source_get_version(filter->context);
-	filter->opacity = 1.0f;
-
-	if (version == 1) {
-		uint32_t opacity =
-			(uint32_t)obs_data_get_int(settings, SETTING_OPACITY);
-		uint32_t color = 0xFFFFFF | (((opacity * 255) / 100) << 24);
-		vec4_from_rgba(&filter->color, color);
-	} else if (version == 2) {
-		filter->opacity =
-			(float)obs_data_get_double(settings, SETTING_OPACITY);
-	}
+	uint32_t opacity =
+		(uint32_t)obs_data_get_int(settings, SETTING_OPACITY);
+	uint32_t color = 0xFFFFFF | (((opacity * 255) / 100) << 24);
+	double contrast = obs_data_get_double(settings, SETTING_CONTRAST);
+	double brightness = obs_data_get_double(settings, SETTING_BRIGHTNESS);
+	double gamma = obs_data_get_double(settings, SETTING_GAMMA);
+
+	contrast = (contrast < 0.0) ? (1.0 / (-contrast + 1.0))
+				    : (contrast + 1.0);
+
+	brightness *= 0.5;
+
+	gamma = (gamma < 0.0) ? (-gamma + 1.0) : (1.0 / (gamma + 1.0));
+
+	filter->contrast = (float)contrast;
+	filter->brightness = (float)brightness;
+	filter->gamma = (float)gamma;
+
+	vec4_from_rgba(&filter->color, color);
+}
+
+static inline void
+color_settings_update_v2(struct color_key_filter_data_v2 *filter,
+			 obs_data_t *settings)
+{
+	filter->opacity = (float)obs_data_get_double(settings, SETTING_OPACITY);
 
 	double contrast = obs_data_get_double(settings, SETTING_CONTRAST);
 	contrast = (contrast < 0.0) ? (1.0 / (-contrast + 1.0))
@@ -81,16 +118,39 @@ static inline void color_settings_update(struct color_key_filter_data *filter,
 	filter->brightness =
 		(float)obs_data_get_double(settings, SETTING_BRIGHTNESS);
 
-	if (version == 1)
-		filter->brightness *= 0.5;
-
 	double gamma = obs_data_get_double(settings, SETTING_GAMMA);
 	gamma = (gamma < 0.0) ? (-gamma + 1.0) : (1.0 / (gamma + 1.0));
 	filter->gamma = (float)gamma;
 }
 
-static inline void key_settings_update(struct color_key_filter_data *filter,
-				       obs_data_t *settings)
+static inline void key_settings_update_v1(struct color_key_filter_data *filter,
+					  obs_data_t *settings)
+{
+	int64_t similarity = obs_data_get_int(settings, SETTING_SIMILARITY);
+	int64_t smoothness = obs_data_get_int(settings, SETTING_SMOOTHNESS);
+	uint32_t key_color =
+		(uint32_t)obs_data_get_int(settings, SETTING_KEY_COLOR);
+	const char *key_type =
+		obs_data_get_string(settings, SETTING_COLOR_TYPE);
+
+	if (strcmp(key_type, "green") == 0)
+		key_color = 0x00FF00;
+	else if (strcmp(key_type, "blue") == 0)
+		key_color = 0xFF0000;
+	else if (strcmp(key_type, "red") == 0)
+		key_color = 0x0000FF;
+	else if (strcmp(key_type, "magenta") == 0)
+		key_color = 0xFF00FF;
+
+	vec4_from_rgba(&filter->key_color, key_color | 0xFF000000);
+
+	filter->similarity = (float)similarity / 1000.0f;
+	filter->smoothness = (float)smoothness / 1000.0f;
+}
+
+static inline void
+key_settings_update_v2(struct color_key_filter_data_v2 *filter,
+		       obs_data_t *settings)
 {
 	int64_t similarity = obs_data_get_int(settings, SETTING_SIMILARITY);
 	int64_t smoothness = obs_data_get_int(settings, SETTING_SMOOTHNESS);
@@ -114,15 +174,23 @@ static inline void key_settings_update(struct color_key_filter_data *filter,
 	filter->smoothness = (float)smoothness / 1000.0f;
 }
 
-static void color_key_update(void *data, obs_data_t *settings)
+static void color_key_update_v1(void *data, obs_data_t *settings)
 {
 	struct color_key_filter_data *filter = data;
 
-	color_settings_update(filter, settings);
-	key_settings_update(filter, settings);
+	color_settings_update_v1(filter, settings);
+	key_settings_update_v1(filter, settings);
 }
 
-static void color_key_destroy(void *data)
+static void color_key_update_v2(void *data, obs_data_t *settings)
+{
+	struct color_key_filter_data_v2 *filter = data;
+
+	color_settings_update_v2(filter, settings);
+	key_settings_update_v2(filter, settings);
+}
+
+static void color_key_destroy_v1(void *data)
 {
 	struct color_key_filter_data *filter = data;
 
@@ -135,17 +203,24 @@ static void color_key_destroy(void *data)
 	bfree(data);
 }
 
-static void *color_key_create(obs_data_t *settings, obs_source_t *context)
+static void color_key_destroy_v2(void *data)
+{
+	struct color_key_filter_data_v2 *filter = data;
+
+	if (filter->effect) {
+		obs_enter_graphics();
+		gs_effect_destroy(filter->effect);
+		obs_leave_graphics();
+	}
+
+	bfree(data);
+}
+
+static void *color_key_create_v1(obs_data_t *settings, obs_source_t *context)
 {
 	struct color_key_filter_data *filter =
 		bzalloc(sizeof(struct color_key_filter_data));
-	char *effect_path = NULL;
-	uint32_t version = obs_source_get_version(context);
-
-	if (version == 1)
-		effect_path = obs_module_file("color_key_filter.effect");
-	else if (version == 2)
-		effect_path = obs_module_file("color_key_filter_v2.effect");
+	char *effect_path = obs_module_file("color_key_filter.effect");
 
 	filter->context = context;
 
@@ -153,13 +228,49 @@ static void *color_key_create(obs_data_t *settings, obs_source_t *context)
 
 	filter->effect = gs_effect_create_from_file(effect_path, NULL);
 	if (filter->effect) {
-		if (version == 1)
-			filter->color_param = gs_effect_get_param_by_name(
-				filter->effect, "color");
-		else if (version == 2)
-			filter->opacity_param = gs_effect_get_param_by_name(
-				filter->effect, "opacity");
+		filter->color_param =
+			gs_effect_get_param_by_name(filter->effect, "color");
+		filter->contrast_param =
+			gs_effect_get_param_by_name(filter->effect, "contrast");
+		filter->brightness_param = gs_effect_get_param_by_name(
+			filter->effect, "brightness");
+		filter->gamma_param =
+			gs_effect_get_param_by_name(filter->effect, "gamma");
+		filter->key_color_param = gs_effect_get_param_by_name(
+			filter->effect, "key_color");
+		filter->similarity_param = gs_effect_get_param_by_name(
+			filter->effect, "similarity");
+		filter->smoothness_param = gs_effect_get_param_by_name(
+			filter->effect, "smoothness");
+	}
+
+	obs_leave_graphics();
+
+	bfree(effect_path);
 
+	if (!filter->effect) {
+		color_key_destroy_v1(filter);
+		return NULL;
+	}
+
+	color_key_update_v1(filter, settings);
+	return filter;
+}
+
+static void *color_key_create_v2(obs_data_t *settings, obs_source_t *context)
+{
+	struct color_key_filter_data_v2 *filter =
+		bzalloc(sizeof(struct color_key_filter_data_v2));
+	char *effect_path = obs_module_file("color_key_filter_v2.effect");
+
+	filter->context = context;
+
+	obs_enter_graphics();
+
+	filter->effect = gs_effect_create_from_file(effect_path, NULL);
+	if (filter->effect) {
+		filter->opacity_param =
+			gs_effect_get_param_by_name(filter->effect, "opacity");
 		filter->contrast_param =
 			gs_effect_get_param_by_name(filter->effect, "contrast");
 		filter->brightness_param = gs_effect_get_param_by_name(
@@ -179,15 +290,15 @@ static void *color_key_create(obs_data_t *settings, obs_source_t *context)
 	bfree(effect_path);
 
 	if (!filter->effect) {
-		color_key_destroy(filter);
+		color_key_destroy_v2(filter);
 		return NULL;
 	}
 
-	color_key_update(filter, settings);
+	color_key_update_v2(filter, settings);
 	return filter;
 }
 
-static void color_key_render(void *data, gs_effect_t *effect)
+static void color_key_render_v1(void *data, gs_effect_t *effect)
 {
 	struct color_key_filter_data *filter = data;
 
@@ -195,12 +306,28 @@ static void color_key_render(void *data, gs_effect_t *effect)
 					     OBS_ALLOW_DIRECT_RENDERING))
 		return;
 
-	if (filter->color_param)
-		gs_effect_set_vec4(filter->color_param, &filter->color);
+	gs_effect_set_vec4(filter->color_param, &filter->color);
+	gs_effect_set_float(filter->contrast_param, filter->contrast);
+	gs_effect_set_float(filter->brightness_param, filter->brightness);
+	gs_effect_set_float(filter->gamma_param, filter->gamma);
+	gs_effect_set_vec4(filter->key_color_param, &filter->key_color);
+	gs_effect_set_float(filter->similarity_param, filter->similarity);
+	gs_effect_set_float(filter->smoothness_param, filter->smoothness);
+
+	obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
+
+	UNUSED_PARAMETER(effect);
+}
+
+static void color_key_render_v2(void *data, gs_effect_t *effect)
+{
+	struct color_key_filter_data_v2 *filter = data;
 
-	if (filter->opacity_param)
-		gs_effect_set_float(filter->opacity_param, filter->opacity);
+	if (!obs_source_process_filter_begin(filter->context, GS_RGBA,
+					     OBS_ALLOW_DIRECT_RENDERING))
+		return;
 
+	gs_effect_set_float(filter->opacity_param, filter->opacity);
 	gs_effect_set_float(filter->contrast_param, filter->contrast);
 	gs_effect_set_float(filter->brightness_param, filter->brightness);
 	gs_effect_set_float(filter->gamma_param, filter->gamma);
@@ -231,7 +358,7 @@ static bool key_type_changed(obs_properties_t *props, obs_property_t *p,
 	return true;
 }
 
-static obs_properties_t *color_key_properties(uint32_t version)
+static obs_properties_t *color_key_properties_v1(void *data)
 {
 	obs_properties_t *props = obs_properties_create();
 
@@ -254,37 +381,58 @@ static obs_properties_t *color_key_properties(uint32_t version)
 	obs_properties_add_int_slider(props, SETTING_SMOOTHNESS,
 				      TEXT_SMOOTHNESS, 1, 1000, 1);
 
-	if (version == 1)
-		obs_properties_add_int_slider(props, SETTING_OPACITY,
-					      TEXT_OPACITY, 0, 100, 1);
-	else if (version == 2)
-		obs_properties_add_float_slider(props, SETTING_OPACITY,
-						TEXT_OPACITY, 0.0, 1.0, 0.0001);
-
+	obs_properties_add_int_slider(props, SETTING_OPACITY, TEXT_OPACITY, 0,
+				      100, 1);
 	obs_properties_add_float_slider(props, SETTING_CONTRAST, TEXT_CONTRAST,
-					-4.0, 4.0, 0.01);
+					-1.0, 1.0, 0.01);
 	obs_properties_add_float_slider(props, SETTING_BRIGHTNESS,
-					TEXT_BRIGHTNESS, -1.0, 1.0, 0.0001);
+					TEXT_BRIGHTNESS, -1.0, 1.0, 0.01);
 	obs_properties_add_float_slider(props, SETTING_GAMMA, TEXT_GAMMA, -1.0,
 					1.0, 0.01);
 
-	return props;
-}
-
-static obs_properties_t *color_key_properties_v1(void *data)
-{
 	UNUSED_PARAMETER(data);
-	return color_key_properties(1);
+	return props;
 }
 
 static obs_properties_t *color_key_properties_v2(void *data)
 {
+	obs_properties_t *props = obs_properties_create();
+
+	obs_property_t *p = obs_properties_add_list(props, SETTING_COLOR_TYPE,
+						    TEXT_COLOR_TYPE,
+						    OBS_COMBO_TYPE_LIST,
+						    OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(p, obs_module_text("Green"), "green");
+	obs_property_list_add_string(p, obs_module_text("Blue"), "blue");
+	obs_property_list_add_string(p, obs_module_text("Red"), "red");
+	obs_property_list_add_string(p, obs_module_text("Magenta"), "magenta");
+	obs_property_list_add_string(p, obs_module_text("CustomColor"),
+				     "custom");
+
+	obs_property_set_modified_callback(p, key_type_changed);
+
+	obs_properties_add_color(props, SETTING_KEY_COLOR, TEXT_KEY_COLOR);
+	obs_properties_add_int_slider(props, SETTING_SIMILARITY,
+				      TEXT_SIMILARITY, 1, 1000, 1);
+	obs_properties_add_int_slider(props, SETTING_SMOOTHNESS,
+				      TEXT_SMOOTHNESS, 1, 1000, 1);
+
+	obs_properties_add_float_slider(props, SETTING_OPACITY, TEXT_OPACITY,
+					0.0, 1.0, 0.0001);
+	obs_properties_add_float_slider(props, SETTING_CONTRAST, TEXT_CONTRAST,
+					-4.0, 4.0, 0.01);
+	obs_properties_add_float_slider(props, SETTING_BRIGHTNESS,
+					TEXT_BRIGHTNESS, -1.0, 1.0, 0.0001);
+	obs_properties_add_float_slider(props, SETTING_GAMMA, TEXT_GAMMA, -1.0,
+					1.0, 0.01);
+
 	UNUSED_PARAMETER(data);
-	return color_key_properties(2);
+	return props;
 }
 
-static void color_key_defaults(obs_data_t *settings)
+static void color_key_defaults_v1(obs_data_t *settings)
 {
+	obs_data_set_default_int(settings, SETTING_OPACITY, 100);
 	obs_data_set_default_double(settings, SETTING_CONTRAST, 0.0);
 	obs_data_set_default_double(settings, SETTING_BRIGHTNESS, 0.0);
 	obs_data_set_default_double(settings, SETTING_GAMMA, 0.0);
@@ -294,16 +442,16 @@ static void color_key_defaults(obs_data_t *settings)
 	obs_data_set_default_int(settings, SETTING_SMOOTHNESS, 50);
 }
 
-static void color_key_defaults_v1(obs_data_t *settings)
-{
-	color_key_defaults(settings);
-	obs_data_set_default_int(settings, SETTING_OPACITY, 100);
-}
-
 static void color_key_defaults_v2(obs_data_t *settings)
 {
-	color_key_defaults(settings);
 	obs_data_set_default_double(settings, SETTING_OPACITY, 1.0);
+	obs_data_set_default_double(settings, SETTING_CONTRAST, 0.0);
+	obs_data_set_default_double(settings, SETTING_BRIGHTNESS, 0.0);
+	obs_data_set_default_double(settings, SETTING_GAMMA, 0.0);
+	obs_data_set_default_int(settings, SETTING_KEY_COLOR, 0x00FF00);
+	obs_data_set_default_string(settings, SETTING_COLOR_TYPE, "green");
+	obs_data_set_default_int(settings, SETTING_SIMILARITY, 80);
+	obs_data_set_default_int(settings, SETTING_SMOOTHNESS, 50);
 }
 
 struct obs_source_info color_key_filter = {
@@ -311,10 +459,10 @@ struct obs_source_info color_key_filter = {
 	.type = OBS_SOURCE_TYPE_FILTER,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CAP_OBSOLETE,
 	.get_name = color_key_name,
-	.create = color_key_create,
-	.destroy = color_key_destroy,
-	.video_render = color_key_render,
-	.update = color_key_update,
+	.create = color_key_create_v1,
+	.destroy = color_key_destroy_v1,
+	.video_render = color_key_render_v1,
+	.update = color_key_update_v1,
 	.get_properties = color_key_properties_v1,
 	.get_defaults = color_key_defaults_v1,
 };
@@ -325,10 +473,10 @@ struct obs_source_info color_key_filter_v2 = {
 	.type = OBS_SOURCE_TYPE_FILTER,
 	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
 	.get_name = color_key_name,
-	.create = color_key_create,
-	.destroy = color_key_destroy,
-	.video_render = color_key_render,
-	.update = color_key_update,
+	.create = color_key_create_v2,
+	.destroy = color_key_destroy_v2,
+	.video_render = color_key_render_v2,
+	.update = color_key_update_v2,
 	.get_properties = color_key_properties_v2,
 	.get_defaults = color_key_defaults_v2,
 };