opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Allow transitions to give placeholder

Browse Source 
The fade transition could benefit by providing NULL to differentiate a
real source texture from the transparent placeholder. This would give it
a chance to fade correctly for source transitions.
This commit is contained in:
jpark37
2022-04-07 01:49:57 -07:00
committed by Jim
parent 42c7e29d25
commit 8194e9431e
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-source-transition.c
+11 -2
View File
@@ -725,6 +725,15 @@ void obs_transition_force_stop(obs_source_t *transition)
void obs_transition_video_render(obs_source_t *transition,
obs_transition_video_render_callback_t callback)
{
obs_transition_video_render2(transition, callback,
obs->video.transparent_texture);
}
void obs_transition_video_render2(
obs_source_t *transition,
obs_transition_video_render_callback_t callback,
gs_texture_t *placeholder_texture)
{
struct transition_state state;
struct matrix4 matrices[2];
@@ -773,9 +782,9 @@ void obs_transition_video_render(obs_source_t *transition,
source_space);
tex[i] = get_texture(transition, i);
if (!tex[i])
tex[i] = obs->video.transparent_texture;
tex[i] = placeholder_texture;
} else {
tex[i] = obs->video.transparent_texture;
tex[i] = placeholder_texture;
}
}
libobs/obs.h
+5
View File
@@ -1587,6 +1587,11 @@ EXPORT void
obs_transition_video_render(obs_source_t *transition,
obs_transition_video_render_callback_t callback);
EXPORT void
obs_transition_video_render2(obs_source_t *transition,
obs_transition_video_render_callback_t callback,
gs_texture_t *placeholder_texture);
EXPORT enum gs_color_space
obs_transition_video_get_color_space(obs_source_t *transition);