jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-transitions: Add "Mask only" track matte option

Browse Source
This commit is contained in:
jp9000 2021-08-08 15:42:37 -07:00
parent 884f707d31
commit 30c264c8bf
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/obs-transitions/data/locale/en-US.ini
View File

@ -25,6 +25,7 @@ TrackMatteLayout="Matte Layout"
TrackMatteLayoutHorizontal="Same file, side-by-side (stinger on the left, track matte on the right)"
TrackMatteLayoutVertical="Same file, stacked (stinger on top, track matte at the bottom)"
TrackMatteLayoutSeparateFile="Separate file (warning: matte can get out of sync)"
TrackMatteLayoutMask="Mask only"
AudioFadeStyle="Audio Fade Style"
AudioFadeStyle.FadeOutFadeIn="Fade out to transition point then fade in"
AudioFadeStyle.CrossFade="Crossfade"

16
plugins/obs-transitions/transition-stinger.c
View File

@ -4,9 +4,12 @@
#define TIMING_TIME 0
#define TIMING_FRAME 1
#define MATTE_LAYOUT_HORIZONTAL 0
#define MATTE_LAYOUT_VERTICAL 1
#define MATTE_LAYOUT_SEPARATE_FILE 2
enum matte_layout {
MATTE_LAYOUT_HORIZONTAL,
MATTE_LAYOUT_VERTICAL,
MATTE_LAYOUT_SEPARATE_FILE,
MATTE_LAYOUT_MASK,
};
enum fade_style { FADE_STYLE_FADE_OUT_FADE_IN, FADE_STYLE_CROSS_FADE };
@ -100,7 +103,7 @@ static void stinger_update(void *data, obs_data_t *settings)
s->invert_matte = obs_data_get_bool(settings, "invert_matte");
s->do_texrender = s->track_matte_enabled &&
s->matte_layout != MATTE_LAYOUT_SEPARATE_FILE;
s->matte_layout < MATTE_LAYOUT_SEPARATE_FILE;
if (s->matte_source) {
obs_source_release(s->matte_source);
@ -305,6 +308,8 @@ static void stinger_video_render(void *data, gs_effect_t *effect)
if (s->track_matte_enabled) {
obs_transition_video_render(s->source, stinger_matte_render);
if (s->matte_layout == MATTE_LAYOUT_MASK)
return;
} else {
float t = obs_transition_get_time(s->source);
bool use_a = t < s->transition_point;
@ -656,6 +661,9 @@ static obs_properties_t *stinger_properties(void *data)
p, obs_module_text("TrackMatteLayoutSeparateFile"),
MATTE_LAYOUT_SEPARATE_FILE);
#endif
obs_property_list_add_int(
p, obs_module_text("TrackMatteLayoutMask"),
MATTE_LAYOUT_MASK);
obs_property_set_modified_callback(p,
track_matte_layout_modified);