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

obs-transitions: Add frame transition point option to stinger 

Allows the user to specify a frame instead of a timestamp for
the transition point.
master
derrod 2017-08-08 10:08:23 +02:00
parent 8b3921ffbf
commit aa6bd58ce3
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,10 @@ Direction.Down="Down"
SwipeIn="Swipe In" SwipeIn="Swipe In"
Color="Color" Color="Color"
VideoFile="Video File" VideoFile="Video File"
TransitionPoint="Transition Point (milliseconds)" TransitionPoint="Transition Point"
TransitionPointType="Transition Point Type"
TransitionPointTypeFrame="Frame"
TransitionPointTypeTime="Time (milliseconds)"
SwitchPoint="Peak Color Point (percentage)" SwitchPoint="Peak Color Point (percentage)"
LumaWipeTransition="Luma Wipe" LumaWipeTransition="Luma Wipe"
LumaWipe.Image="Image" LumaWipe.Image="Image"

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

@ -1,16 +1,22 @@
#include <obs-module.h> #include <obs-module.h>
#define TIMING_TIME 0
#define TIMING_FRAME 1
struct stinger_info { struct stinger_info {
obs_source_t *source; obs_source_t *source;
obs_source_t *media_source; obs_source_t *media_source;
uint64_t duration_ns; uint64_t duration_ns;
uint64_t duration_frames;
uint64_t transition_point_ns; uint64_t transition_point_ns;
uint64_t transition_point_frame;
float transition_point; float transition_point;
float transition_a_mul; float transition_a_mul;
float transition_b_mul; float transition_b_mul;
bool transitioning; bool transitioning;
bool transition_point_is_frame;
}; };
static const char *stinger_get_name(void *type_data) static const char *stinger_get_name(void *type_data)
@ -32,9 +38,15 @@ static void stinger_update(void *data, obs_data_t *settings)
media_settings); media_settings);
obs_data_release(media_settings); obs_data_release(media_settings);
int64_t point_ms = obs_data_get_int(settings, "transition_point"); int64_t point = obs_data_get_int(settings, "transition_point");
s->transition_point_ns = (uint64_t)(point_ms * 1000000LL); s->transition_point_is_frame =
obs_data_get_int(settings, "tp_type") == TIMING_FRAME;
if (s->transition_point_is_frame)
s->transition_point_frame = (uint64_t)point;
else
s->transition_point_ns = (uint64_t)(point * 1000000LL);
} }
static void *stinger_create(obs_data_t *settings, obs_source_t *source) static void *stinger_create(obs_data_t *settings, obs_source_t *source)
@ -165,12 +177,19 @@ static void stinger_transition_start(void *data)
} }
proc_handler_call(ph, "get_duration", &cd); proc_handler_call(ph, "get_duration", &cd);
proc_handler_call(ph, "get_nb_frames", &cd);
s->duration_ns = (uint64_t)calldata_int(&cd, "duration"); s->duration_ns = (uint64_t)calldata_int(&cd, "duration");
s->duration_frames = (uint64_t)calldata_int(&cd, "num_frames");
if (s->transition_point_is_frame)
s->transition_point = (float)(
(long double)s->transition_point_frame /
(long double)s->duration_frames);
else
s->transition_point = (float)( s->transition_point = (float)(
(long double)s->transition_point_ns / (long double)s->transition_point_ns /
(long double)s->duration_ns); (long double)s->duration_ns);
if (s->transition_point > 1.0f) if (s->transition_point > 1.0f)
s->transition_point = 1.0f; s->transition_point = 1.0f;
else if (s->transition_point < 0.001f) else if (s->transition_point < 0.001f)
@ -229,6 +248,14 @@ static obs_properties_t *stinger_properties(void *data)
obs_module_text("VideoFile"), obs_module_text("VideoFile"),
OBS_PATH_FILE, OBS_PATH_FILE,
FILE_FILTER, NULL); FILE_FILTER, NULL);
obs_property_t *list = obs_properties_add_list(ppts, "tp_type",
obs_module_text("TransitionPointType"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_list_add_int(list,
obs_module_text("TransitionPointTypeTime"), TIMING_TIME);
obs_property_list_add_int(list,
obs_module_text("TransitionPointTypeFrame"), TIMING_FRAME);
obs_properties_add_int(ppts, "transition_point", obs_properties_add_int(ppts, "transition_point",
obs_module_text("TransitionPoint"), obs_module_text("TransitionPoint"),
0, 120000, 1); 0, 120000, 1);