New upstream version 24.0.1+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
b14f9eae6d
commit
5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
|
|
@ -2,22 +2,22 @@
|
|||
#include <graphics/vec2.h>
|
||||
|
||||
struct scroll_filter_data {
|
||||
obs_source_t *context;
|
||||
obs_source_t *context;
|
||||
|
||||
gs_effect_t *effect;
|
||||
gs_eparam_t *param_add;
|
||||
gs_eparam_t *param_mul;
|
||||
gs_eparam_t *param_image;
|
||||
gs_effect_t *effect;
|
||||
gs_eparam_t *param_add;
|
||||
gs_eparam_t *param_mul;
|
||||
gs_eparam_t *param_image;
|
||||
|
||||
struct vec2 scroll_speed;
|
||||
gs_samplerstate_t *sampler;
|
||||
bool limit_cx;
|
||||
bool limit_cy;
|
||||
uint32_t cx;
|
||||
uint32_t cy;
|
||||
struct vec2 scroll_speed;
|
||||
gs_samplerstate_t *sampler;
|
||||
bool limit_cx;
|
||||
bool limit_cy;
|
||||
uint32_t cx;
|
||||
uint32_t cy;
|
||||
|
||||
struct vec2 size_i;
|
||||
struct vec2 offset;
|
||||
struct vec2 size_i;
|
||||
struct vec2 offset;
|
||||
};
|
||||
|
||||
static const char *scroll_filter_get_name(void *unused)
|
||||
|
|
@ -31,11 +31,9 @@ static void *scroll_filter_create(obs_data_t *settings, obs_source_t *context)
|
|||
struct scroll_filter_data *filter = bzalloc(sizeof(*filter));
|
||||
char *effect_path = obs_module_file("crop_filter.effect");
|
||||
|
||||
struct gs_sampler_info sampler_info = {
|
||||
.filter = GS_FILTER_LINEAR,
|
||||
.address_u = GS_ADDRESS_WRAP,
|
||||
.address_v = GS_ADDRESS_WRAP
|
||||
};
|
||||
struct gs_sampler_info sampler_info = {.filter = GS_FILTER_LINEAR,
|
||||
.address_u = GS_ADDRESS_WRAP,
|
||||
.address_v = GS_ADDRESS_WRAP};
|
||||
|
||||
filter->context = context;
|
||||
|
||||
|
|
@ -51,12 +49,12 @@ static void *scroll_filter_create(obs_data_t *settings, obs_source_t *context)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
filter->param_add = gs_effect_get_param_by_name(filter->effect,
|
||||
"add_val");
|
||||
filter->param_mul = gs_effect_get_param_by_name(filter->effect,
|
||||
"mul_val");
|
||||
filter->param_image = gs_effect_get_param_by_name(filter->effect,
|
||||
"image");
|
||||
filter->param_add =
|
||||
gs_effect_get_param_by_name(filter->effect, "add_val");
|
||||
filter->param_mul =
|
||||
gs_effect_get_param_by_name(filter->effect, "mul_val");
|
||||
filter->param_image =
|
||||
gs_effect_get_param_by_name(filter->effect, "image");
|
||||
|
||||
obs_source_update(context, settings);
|
||||
return filter;
|
||||
|
|
@ -83,10 +81,10 @@ static void scroll_filter_update(void *data, obs_data_t *settings)
|
|||
filter->cx = (uint32_t)obs_data_get_int(settings, "cx");
|
||||
filter->cy = (uint32_t)obs_data_get_int(settings, "cy");
|
||||
|
||||
filter->scroll_speed.x = (float)obs_data_get_double(settings,
|
||||
"speed_x");
|
||||
filter->scroll_speed.y = (float)obs_data_get_double(settings,
|
||||
"speed_y");
|
||||
filter->scroll_speed.x =
|
||||
(float)obs_data_get_double(settings, "speed_x");
|
||||
filter->scroll_speed.y =
|
||||
(float)obs_data_get_double(settings, "speed_y");
|
||||
|
||||
if (filter->scroll_speed.x == 0.0f)
|
||||
filter->offset.x = 0.0f;
|
||||
|
|
@ -95,7 +93,7 @@ static void scroll_filter_update(void *data, obs_data_t *settings)
|
|||
}
|
||||
|
||||
static bool limit_cx_clicked(obs_properties_t *props, obs_property_t *p,
|
||||
obs_data_t *settings)
|
||||
obs_data_t *settings)
|
||||
{
|
||||
bool limit_size = obs_data_get_bool(settings, "limit_cx");
|
||||
obs_property_set_visible(obs_properties_get(props, "cx"), limit_size);
|
||||
|
|
@ -105,7 +103,7 @@ static bool limit_cx_clicked(obs_properties_t *props, obs_property_t *p,
|
|||
}
|
||||
|
||||
static bool limit_cy_clicked(obs_properties_t *props, obs_property_t *p,
|
||||
obs_data_t *settings)
|
||||
obs_data_t *settings)
|
||||
{
|
||||
bool limit_size = obs_data_get_bool(settings, "limit_cy");
|
||||
obs_property_set_visible(obs_properties_get(props, "cy"), limit_size);
|
||||
|
|
@ -120,23 +118,23 @@ static obs_properties_t *scroll_filter_properties(void *data)
|
|||
obs_property_t *p;
|
||||
|
||||
obs_properties_add_float_slider(props, "speed_x",
|
||||
obs_module_text("ScrollFilter.SpeedX"),
|
||||
-500.0, 500.0, 1.0);
|
||||
obs_module_text("ScrollFilter.SpeedX"),
|
||||
-500.0, 500.0, 1.0);
|
||||
obs_properties_add_float_slider(props, "speed_y",
|
||||
obs_module_text("ScrollFilter.SpeedY"),
|
||||
-500.0, 500.0, 1.0);
|
||||
obs_module_text("ScrollFilter.SpeedY"),
|
||||
-500.0, 500.0, 1.0);
|
||||
|
||||
p = obs_properties_add_bool(props, "limit_cx",
|
||||
obs_module_text("ScrollFilter.LimitWidth"));
|
||||
obs_module_text("ScrollFilter.LimitWidth"));
|
||||
obs_property_set_modified_callback(p, limit_cx_clicked);
|
||||
obs_properties_add_int(props, "cx",
|
||||
obs_module_text("Crop.Width"), 1, 8192, 1);
|
||||
obs_properties_add_int(props, "cx", obs_module_text("Crop.Width"), 1,
|
||||
8192, 1);
|
||||
|
||||
p = obs_properties_add_bool(props, "limit_cy",
|
||||
obs_module_text("ScrollFilter.LimitHeight"));
|
||||
p = obs_properties_add_bool(
|
||||
props, "limit_cy", obs_module_text("ScrollFilter.LimitHeight"));
|
||||
obs_property_set_modified_callback(p, limit_cy_clicked);
|
||||
obs_properties_add_int(props, "cy",
|
||||
obs_module_text("Crop.Height"), 1, 8192, 1);
|
||||
obs_properties_add_int(props, "cy", obs_module_text("Crop.Height"), 1,
|
||||
8192, 1);
|
||||
|
||||
UNUSED_PARAMETER(data);
|
||||
return props;
|
||||
|
|
@ -179,21 +177,19 @@ static void scroll_filter_render(void *data, gs_effect_t *effect)
|
|||
cy = filter->limit_cy ? filter->cy : base_cy;
|
||||
|
||||
if (base_cx && base_cy) {
|
||||
vec2_set(&filter->size_i,
|
||||
1.0f / (float)base_cx,
|
||||
1.0f / (float)base_cy);
|
||||
vec2_set(&filter->size_i, 1.0f / (float)base_cx,
|
||||
1.0f / (float)base_cy);
|
||||
} else {
|
||||
vec2_zero(&filter->size_i);
|
||||
obs_source_skip_video_filter(filter->context);
|
||||
return;
|
||||
}
|
||||
|
||||
vec2_set(&mul_val,
|
||||
(float)cx / (float)base_cx,
|
||||
(float)cy / (float)base_cy);
|
||||
vec2_set(&mul_val, (float)cx / (float)base_cx,
|
||||
(float)cy / (float)base_cy);
|
||||
|
||||
if (!obs_source_process_filter_begin(filter->context, GS_RGBA,
|
||||
OBS_NO_DIRECT_RENDERING))
|
||||
OBS_NO_DIRECT_RENDERING))
|
||||
return;
|
||||
|
||||
gs_effect_set_vec2(filter->param_add, &filter->offset);
|
||||
|
|
@ -211,8 +207,8 @@ static uint32_t scroll_filter_width(void *data)
|
|||
struct scroll_filter_data *filter = data;
|
||||
obs_source_t *target = obs_filter_get_target(filter->context);
|
||||
|
||||
return filter->limit_cx ?
|
||||
filter->cx : obs_source_get_base_width(target);
|
||||
return filter->limit_cx ? filter->cx
|
||||
: obs_source_get_base_width(target);
|
||||
}
|
||||
|
||||
static uint32_t scroll_filter_height(void *data)
|
||||
|
|
@ -220,22 +216,22 @@ static uint32_t scroll_filter_height(void *data)
|
|||
struct scroll_filter_data *filter = data;
|
||||
obs_source_t *target = obs_filter_get_target(filter->context);
|
||||
|
||||
return filter->limit_cy ?
|
||||
filter->cy : obs_source_get_base_height(target);
|
||||
return filter->limit_cy ? filter->cy
|
||||
: obs_source_get_base_height(target);
|
||||
}
|
||||
|
||||
struct obs_source_info scroll_filter = {
|
||||
.id = "scroll_filter",
|
||||
.type = OBS_SOURCE_TYPE_FILTER,
|
||||
.output_flags = OBS_SOURCE_VIDEO,
|
||||
.get_name = scroll_filter_get_name,
|
||||
.create = scroll_filter_create,
|
||||
.destroy = scroll_filter_destroy,
|
||||
.update = scroll_filter_update,
|
||||
.get_properties = scroll_filter_properties,
|
||||
.get_defaults = scroll_filter_defaults,
|
||||
.video_tick = scroll_filter_tick,
|
||||
.video_render = scroll_filter_render,
|
||||
.get_width = scroll_filter_width,
|
||||
.get_height = scroll_filter_height
|
||||
.id = "scroll_filter",
|
||||
.type = OBS_SOURCE_TYPE_FILTER,
|
||||
.output_flags = OBS_SOURCE_VIDEO,
|
||||
.get_name = scroll_filter_get_name,
|
||||
.create = scroll_filter_create,
|
||||
.destroy = scroll_filter_destroy,
|
||||
.update = scroll_filter_update,
|
||||
.get_properties = scroll_filter_properties,
|
||||
.get_defaults = scroll_filter_defaults,
|
||||
.video_tick = scroll_filter_tick,
|
||||
.video_render = scroll_filter_render,
|
||||
.get_width = scroll_filter_width,
|
||||
.get_height = scroll_filter_height,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue