opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

libobs, obs-filters: SRGB backwards compatibility

Browse Source 
Add OBS_SOURCE_SRGB to indicate sources that support SRGB rendering. We
can use this flag to know which sources do not know how to handle SRGB,
and disable accordingly inside obs_source_main_render().

We can also use this flag to clean up the filter interface and remove
the SRGB-specific functions. We also need to disable direct rendering if
the filter source wants to render SRGB, but the parent source does not
support it.

Scenes and groups are marked as having SRGB support, and those are
internal sources that we control.
This commit is contained in:
jpark37
2021-05-03 01:19:56 -07:00
committed by Jim
parent bd98e41ca1
commit ae7718a765
15 changed files with 71 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/obs-filters/chroma-key-filter.c
+2 -3
View File
@@ -390,8 +390,7 @@ static void chroma_key_render_v2(void *data, gs_effect_t *effect)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect, 0,
0);
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
gs_blend_state_pop();
@@ -526,7 +525,7 @@ struct obs_source_info chroma_key_filter_v2 = {
.id = "chroma_key_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = chroma_key_name,
.create = chroma_key_create_v2,
.destroy = chroma_key_destroy_v2,
plugins/obs-filters/color-correction-filter.c
+2 -3
View File
@@ -613,8 +613,7 @@ static void color_correction_filter_render_v2(void *data, gs_effect_t *effect)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect, 0,
0);
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
gs_blend_state_pop();
@@ -734,7 +733,7 @@ struct obs_source_info color_filter_v2 = {
.id = "color_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = color_correction_filter_name,
.create = color_correction_filter_create_v2,
.destroy = color_correction_filter_destroy_v2,
plugins/obs-filters/color-grade-filter.c
+3 -3
View File
@@ -452,8 +452,8 @@ static void color_grade_filter_render(void *data, gs_effect_t *effect)
param = gs_effect_get_param_by_name(filter->effect, "cube_width_i");
gs_effect_set_float(param, 1.0f / filter->cube_width);
obs_source_process_filter_tech_end_srgb(filter->context, filter->effect,
0, 0, tech_name);
obs_source_process_filter_tech_end(filter->context, filter->effect, 0,
0, tech_name);
UNUSED_PARAMETER(effect);
}
@@ -461,7 +461,7 @@ static void color_grade_filter_render(void *data, gs_effect_t *effect)
struct obs_source_info color_grade_filter = {
.id = "clut_filter",
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = color_grade_filter_get_name,
.create = color_grade_filter_create,
.destroy = color_grade_filter_destroy,
plugins/obs-filters/color-key-filter.c
+2 -3
View File
@@ -338,8 +338,7 @@ static void color_key_render_v2(void *data, gs_effect_t *effect)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect, 0,
0);
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
gs_blend_state_pop();
@@ -472,7 +471,7 @@ struct obs_source_info color_key_filter_v2 = {
.id = "color_key_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = color_key_name,
.create = color_key_create_v2,
.destroy = color_key_destroy_v2,
plugins/obs-filters/crop-filter.c
+3 -3
View File
@@ -196,8 +196,8 @@ static void crop_filter_render(void *data, gs_effect_t *effect)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect,
filter->width, filter->height);
obs_source_process_filter_end(filter->context, filter->effect,
filter->width, filter->height);
gs_blend_state_pop();
@@ -219,7 +219,7 @@ static uint32_t crop_filter_height(void *data)
struct obs_source_info crop_filter = {
.id = "crop_filter",
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = crop_filter_get_name,
.create = crop_filter_create,
.destroy = crop_filter_destroy,
plugins/obs-filters/luma-key-filter.c
+7 -25
View File
@@ -115,8 +115,10 @@ static void *luma_key_create_v2(obs_data_t *settings, obs_source_t *context)
"luma_key_filter_v2.effect");
}
static void luma_key_render_internal(void *data, bool srgb)
static void luma_key_render(void *data, gs_effect_t *effect)
{
UNUSED_PARAMETER(effect);
struct luma_key_filter_data *filter = data;
if (!obs_source_process_filter_begin(filter->context, GS_RGBA,
@@ -130,27 +132,7 @@ static void luma_key_render_internal(void *data, bool srgb)
gs_effect_set_float(filter->luma_min_smooth_param,
filter->luma_min_smooth);
if (srgb) {
obs_source_process_filter_end_srgb(filter->context,
filter->effect, 0, 0);
} else {
obs_source_process_filter_end(filter->context, filter->effect,
0, 0);
}
}
static void luma_key_render_v1(void *data, gs_effect_t *effect)
{
UNUSED_PARAMETER(effect);
luma_key_render_internal(data, false);
}
static void luma_key_render_v2(void *data, gs_effect_t *effect)
{
UNUSED_PARAMETER(effect);
luma_key_render_internal(data, true);
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
}
static obs_properties_t *luma_key_properties(void *data)
@@ -185,7 +167,7 @@ struct obs_source_info luma_key_filter = {
.get_name = luma_key_name,
.create = luma_key_create_v1,
.destroy = luma_key_destroy,
.video_render = luma_key_render_v1,
.video_render = luma_key_render,
.update = luma_key_update,
.get_properties = luma_key_properties,
.get_defaults = luma_key_defaults,
@@ -195,11 +177,11 @@ struct obs_source_info luma_key_filter_v2 = {
.id = "luma_key_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = luma_key_name,
.create = luma_key_create_v2,
.destroy = luma_key_destroy,
.video_render = luma_key_render_v2,
.video_render = luma_key_render,
.update = luma_key_update,
.get_properties = luma_key_properties,
.get_defaults = luma_key_defaults,
plugins/obs-filters/mask-filter.c
+5 -23
View File
@@ -262,7 +262,7 @@ static void mask_filter_tick(void *data, float seconds)
}
}
static void mask_filter_render_internal(void *data, bool srgb)
static void mask_filter_render(void *data, gs_effect_t *effect)
{
struct mask_filter_data *filter = data;
obs_source_t *target = obs_filter_get_target(filter->context);
@@ -324,27 +324,9 @@ static void mask_filter_render_internal(void *data, bool srgb)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
if (srgb) {
obs_source_process_filter_end_srgb(filter->context,
filter->effect, 0, 0);
} else {
obs_source_process_filter_end(filter->context, filter->effect,
0, 0);
}
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
gs_blend_state_pop();
}
static void mask_filter_render_v1(void *data, gs_effect_t *effect)
{
mask_filter_render_internal(data, false);
UNUSED_PARAMETER(effect);
}
static void mask_filter_render_v2(void *data, gs_effect_t *effect)
{
mask_filter_render_internal(data, true);
UNUSED_PARAMETER(effect);
}
@@ -360,14 +342,14 @@ struct obs_source_info mask_filter = {
.get_defaults = mask_filter_defaults_v1,
.get_properties = mask_filter_properties_v1,
.video_tick = mask_filter_tick,
.video_render = mask_filter_render_v1,
.video_render = mask_filter_render,
};
struct obs_source_info mask_filter_v2 = {
.id = "mask_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = mask_filter_get_name,
.create = mask_filter_create,
.destroy = mask_filter_destroy,
@@ -375,5 +357,5 @@ struct obs_source_info mask_filter_v2 = {
.get_defaults = mask_filter_defaults_v2,
.get_properties = mask_filter_properties_v2,
.video_tick = mask_filter_tick,
.video_render = mask_filter_render_v2,
.video_render = mask_filter_render,
};
plugins/obs-filters/scale-filter.c
+4 -4
View File
@@ -297,9 +297,9 @@ static void scale_filter_render(void *data, gs_effect_t *effect)
gs_effect_set_next_sampler(filter->image_param,
filter->point_sampler);
obs_source_process_filter_tech_end_srgb(filter->context, filter->effect,
filter->cx_out, filter->cy_out,
technique);
obs_source_process_filter_tech_end(filter->context, filter->effect,
filter->cx_out, filter->cy_out,
technique);
UNUSED_PARAMETER(effect);
}
@@ -422,7 +422,7 @@ static uint32_t scale_filter_height(void *data)
struct obs_source_info scale_filter = {
.id = "scale_filter",
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = scale_filter_name,
.create = scale_filter_create,
.destroy = scale_filter_destroy,
plugins/obs-filters/scroll-filter.c
+2 -3
View File
@@ -221,8 +221,7 @@ static void scroll_filter_render(void *data, gs_effect_t *effect)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect, cx,
cy);
obs_source_process_filter_end(filter->context, filter->effect, cx, cy);
gs_blend_state_pop();
@@ -257,7 +256,7 @@ static void scroll_filter_show(void *data)
struct obs_source_info scroll_filter = {
.id = "scroll_filter",
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = scroll_filter_get_name,
.create = scroll_filter_create,
.destroy = scroll_filter_destroy,
plugins/obs-filters/sharpness-filter.c
+5 -18
View File
@@ -73,7 +73,7 @@ static void *sharpness_create(obs_data_t *settings, obs_source_t *context)
return filter;
}
static void sharpness_render_internal(void *data, bool srgb)
static void sharpness_render(void *data, gs_effect_t *effect)
{
struct sharpness_data *filter = data;
@@ -93,22 +93,9 @@ static void sharpness_render_internal(void *data, bool srgb)
gs_blend_state_push();
gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
obs_source_process_filter_end_srgb(filter->context, filter->effect, 0,
0);
obs_source_process_filter_end(filter->context, filter->effect, 0, 0);
gs_blend_state_pop();
}
static void sharpness_render_v1(void *data, gs_effect_t *effect)
{
sharpness_render_internal(data, false);
UNUSED_PARAMETER(effect);
}
static void sharpness_render_v2(void *data, gs_effect_t *effect)
{
sharpness_render_internal(data, true);
UNUSED_PARAMETER(effect);
}
@@ -138,7 +125,7 @@ struct obs_source_info sharpness_filter = {
.create = sharpness_create,
.destroy = sharpness_destroy,
.update = sharpness_update,
.video_render = sharpness_render_v1,
.video_render = sharpness_render,
.get_properties = sharpness_properties,
.get_defaults = sharpness_defaults,
};
@@ -147,12 +134,12 @@ struct obs_source_info sharpness_filter_v2 = {
.id = "sharpness_filter",
.version = 2,
.type = OBS_SOURCE_TYPE_FILTER,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = sharpness_getname,
.create = sharpness_create,
.destroy = sharpness_destroy,
.update = sharpness_update,
.video_render = sharpness_render_v2,
.video_render = sharpness_render,
.get_properties = sharpness_properties,
.get_defaults = sharpness_defaults,
};