obs-filters: Fix filter color space queries
Need to ask target instead of parent.master
parent
64ef93a29d
commit
37621f0fdd
|
@ -382,7 +382,7 @@ static void chroma_key_render_v2(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -549,7 +549,7 @@ chroma_key_get_color_space(void *data, size_t count,
|
|||
|
||||
struct chroma_key_filter_data_v2 *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -612,7 +612,7 @@ static void color_correction_filter_render_v2(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -738,7 +738,7 @@ static enum gs_color_space color_correction_filter_get_color_space(
|
|||
|
||||
struct color_correction_filter_data_v2 *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -465,7 +465,7 @@ static void color_grade_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -523,7 +523,7 @@ color_grade_filter_get_color_space(void *data, size_t count,
|
|||
|
||||
struct lut_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -334,7 +334,7 @@ static void color_key_render_v2(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -493,7 +493,7 @@ color_key_get_color_space(void *data, size_t count,
|
|||
|
||||
struct color_key_filter_data_v2 *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -242,7 +242,7 @@ static void crop_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
float multiplier;
|
||||
const char *technique = get_tech_name_and_multiplier(
|
||||
|
@ -292,7 +292,7 @@ crop_filter_get_color_space(void *data, size_t count,
|
|||
|
||||
struct crop_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
enum gs_color_space space = source_space;
|
||||
|
|
|
@ -286,7 +286,7 @@ static void gpu_delay_filter_render(void *data, gs_effect_t *effect)
|
|||
GS_CS_709_EXTENDED,
|
||||
};
|
||||
const enum gs_color_space space = obs_source_get_color_space(
|
||||
parent, OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
target, OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
const enum gs_color_format format = gs_get_format_from_space(space);
|
||||
if (gs_texrender_get_format(frame.render) != format) {
|
||||
gs_texrender_destroy(frame.render);
|
||||
|
|
|
@ -128,7 +128,7 @@ static void luma_key_render_internal(void *data, bool premultiplied)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -216,7 +216,7 @@ luma_key_get_color_space(void *data, size_t count,
|
|||
|
||||
struct luma_key_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -289,7 +289,7 @@ static void mask_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -372,7 +372,7 @@ mask_filter_get_color_space(void *data, size_t count,
|
|||
|
||||
struct mask_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
|
@ -683,8 +683,7 @@ static void nv_greenscreen_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
target, OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
|
||||
if (filter->space != source_space) {
|
||||
filter->space = source_space;
|
||||
|
@ -937,7 +936,7 @@ static enum gs_color_space nv_greenscreen_filter_get_color_space(
|
|||
|
||||
struct nv_greenscreen_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
enum gs_color_space space = source_space;
|
||||
|
|
|
@ -414,7 +414,7 @@ static void scale_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
float multiplier;
|
||||
const char *technique = get_tech_name_and_multiplier(
|
||||
|
@ -583,7 +583,7 @@ scale_filter_get_color_space(void *data, size_t count,
|
|||
|
||||
struct scale_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
enum gs_color_space space = source_space;
|
||||
|
|
|
@ -265,7 +265,7 @@ static void scroll_filter_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
float multiplier;
|
||||
const char *technique = get_tech_name_and_multiplier(
|
||||
|
@ -329,7 +329,7 @@ scroll_filter_get_color_space(void *data, size_t count,
|
|||
|
||||
struct scroll_filter_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
enum gs_color_space space = source_space;
|
||||
|
|
|
@ -86,7 +86,7 @@ static void sharpness_render(void *data, gs_effect_t *effect)
|
|||
};
|
||||
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(preferred_spaces), preferred_spaces);
|
||||
if (source_space == GS_CS_709_EXTENDED) {
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
|
@ -150,7 +150,7 @@ sharpness_get_color_space(void *data, size_t count,
|
|||
|
||||
struct sharpness_data *const filter = data;
|
||||
const enum gs_color_space source_space = obs_source_get_color_space(
|
||||
obs_filter_get_parent(filter->context),
|
||||
obs_filter_get_target(filter->context),
|
||||
OBS_COUNTOF(potential_spaces), potential_spaces);
|
||||
|
||||
return source_space;
|
||||
|
|
Loading…
Reference in New Issue