New upstream version 24.0.1+dfsg1
This commit is contained in:
parent
b14f9eae6d
commit
5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
|
|
@ -2,6 +2,8 @@
|
|||
#include <graphics/image-file.h>
|
||||
#include <util/dstr.h>
|
||||
|
||||
/* clang-format off */
|
||||
|
||||
#define S_LUMA_IMG "luma_image"
|
||||
#define S_LUMA_INV "luma_invert"
|
||||
#define S_LUMA_SOFT "luma_softness"
|
||||
|
|
@ -10,6 +12,8 @@
|
|||
#define T_LUMA_INV obs_module_text("LumaWipe.Invert")
|
||||
#define T_LUMA_SOFT obs_module_text("LumaWipe.Softness")
|
||||
|
||||
/* clang-format on */
|
||||
|
||||
struct luma_wipe_info {
|
||||
obs_source_t *source;
|
||||
|
||||
|
|
@ -22,7 +26,7 @@ struct luma_wipe_info {
|
|||
gs_eparam_t *ep_softness;
|
||||
|
||||
gs_image_file_t luma_image;
|
||||
bool invert_luma;
|
||||
bool invert_luma;
|
||||
float softness;
|
||||
obs_data_t *wipes_list;
|
||||
};
|
||||
|
|
@ -94,14 +98,14 @@ static void *luma_wipe_create(obs_data_t *settings, obs_source_t *source)
|
|||
|
||||
lwipe = bzalloc(sizeof(*lwipe));
|
||||
|
||||
lwipe->effect = effect;
|
||||
lwipe->ep_a_tex = gs_effect_get_param_by_name(effect, "a_tex");
|
||||
lwipe->ep_b_tex = gs_effect_get_param_by_name(effect, "b_tex");
|
||||
lwipe->ep_l_tex = gs_effect_get_param_by_name(effect, "l_tex");
|
||||
lwipe->effect = effect;
|
||||
lwipe->ep_a_tex = gs_effect_get_param_by_name(effect, "a_tex");
|
||||
lwipe->ep_b_tex = gs_effect_get_param_by_name(effect, "b_tex");
|
||||
lwipe->ep_l_tex = gs_effect_get_param_by_name(effect, "l_tex");
|
||||
lwipe->ep_progress = gs_effect_get_param_by_name(effect, "progress");
|
||||
lwipe->ep_invert = gs_effect_get_param_by_name(effect, "invert");
|
||||
lwipe->ep_invert = gs_effect_get_param_by_name(effect, "invert");
|
||||
lwipe->ep_softness = gs_effect_get_param_by_name(effect, "softness");
|
||||
lwipe->source = source;
|
||||
lwipe->source = source;
|
||||
|
||||
luma_wipe_get_list(lwipe);
|
||||
|
||||
|
|
@ -131,7 +135,8 @@ static obs_properties_t *luma_wipe_properties(void *data)
|
|||
obs_property_t *p;
|
||||
|
||||
p = obs_properties_add_list(props, S_LUMA_IMG, T_LUMA_IMG,
|
||||
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
|
||||
OBS_COMBO_TYPE_LIST,
|
||||
OBS_COMBO_FORMAT_STRING);
|
||||
|
||||
obs_data_item_t *item = obs_data_first(lwipe->wipes_list);
|
||||
|
||||
|
|
@ -141,7 +146,8 @@ static obs_properties_t *luma_wipe_properties(void *data)
|
|||
obs_property_list_add_string(p, obs_module_text(name), path);
|
||||
}
|
||||
|
||||
obs_properties_add_float(props, S_LUMA_SOFT, T_LUMA_SOFT, 0.0, 1.0, 0.05);
|
||||
obs_properties_add_float(props, S_LUMA_SOFT, T_LUMA_SOFT, 0.0, 1.0,
|
||||
0.05);
|
||||
obs_properties_add_bool(props, S_LUMA_INV, T_LUMA_INV);
|
||||
|
||||
return props;
|
||||
|
|
@ -191,23 +197,23 @@ static float mix_b(void *data, float t)
|
|||
}
|
||||
|
||||
bool luma_wipe_audio_render(void *data, uint64_t *ts_out,
|
||||
struct obs_source_audio_mix *audio, uint32_t mixers,
|
||||
size_t channels, size_t sample_rate)
|
||||
struct obs_source_audio_mix *audio, uint32_t mixers,
|
||||
size_t channels, size_t sample_rate)
|
||||
{
|
||||
struct luma_wipe_info *lwipe = data;
|
||||
return obs_transition_audio_render(lwipe->source, ts_out, audio, mixers,
|
||||
channels, sample_rate, mix_a, mix_b);
|
||||
channels, sample_rate, mix_a, mix_b);
|
||||
}
|
||||
|
||||
struct obs_source_info luma_wipe_transition = {
|
||||
.id = "wipe_transition",
|
||||
.type = OBS_SOURCE_TYPE_TRANSITION,
|
||||
.get_name = luma_wipe_get_name,
|
||||
.create = luma_wipe_create,
|
||||
.destroy = luma_wipe_destroy,
|
||||
.update = luma_wipe_update,
|
||||
.video_render = luma_wipe_video_render,
|
||||
.audio_render = luma_wipe_audio_render,
|
||||
.get_properties = luma_wipe_properties,
|
||||
.get_defaults = luma_wipe_defaults
|
||||
.id = "wipe_transition",
|
||||
.type = OBS_SOURCE_TYPE_TRANSITION,
|
||||
.get_name = luma_wipe_get_name,
|
||||
.create = luma_wipe_create,
|
||||
.destroy = luma_wipe_destroy,
|
||||
.update = luma_wipe_update,
|
||||
.video_render = luma_wipe_video_render,
|
||||
.audio_render = luma_wipe_audio_render,
|
||||
.get_properties = luma_wipe_properties,
|
||||
.get_defaults = luma_wipe_defaults,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue