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: Filter async video before rendering

Browse Source 
Filtering the video before it's output to the texture means that it
happens after all the processing on the timestamps and such of the video
data.  This way, the video filter does not have to worry about what's
currently buffered, and it won't affect timing.
This commit is contained in:
jp9000
2015-03-25 10:03:19 -07:00
parent a73816665c
commit 2b4fdb19ad
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-source.c
+16 -18
View File
@@ -1125,13 +1125,23 @@ static void obs_source_draw_async_texture(struct obs_source *source)
}
}
static inline struct obs_source_frame *filter_async_video(obs_source_t *source,
struct obs_source_frame *in);
static void obs_source_render_async_video(obs_source_t *source)
{
if (!source->async_rendered) {
struct obs_source_frame *frame = obs_source_get_frame(source);
if (frame)
frame = filter_async_video(source, frame);
source->async_rendered = true;
if (frame) {
source->timing_adjust =
os_gettime_ns() - frame->timestamp;
source->timing_set = true;
if (!set_async_texture_size(source, frame))
return;
if (!update_async_texture(source, frame))
@@ -1457,6 +1467,9 @@ static inline struct obs_source_frame *filter_async_video(obs_source_t *source,
struct obs_source_frame *in)
{
size_t i;
pthread_mutex_lock(&source->filter_mutex);
for (i = source->filters.num; i > 0; i--) {
struct obs_source *filter = source->filters.array[i-1];
@@ -1467,10 +1480,12 @@ static inline struct obs_source_frame *filter_async_video(obs_source_t *source,
in = filter->info.filter_video(filter->context.data,
in);
if (!in)
return NULL;
break;
}
}
pthread_mutex_unlock(&source->filter_mutex);
return in;
}
@@ -1616,20 +1631,6 @@ void obs_source_output_video(obs_source_t *source,
struct obs_source_frame *output = !!frame ?
cache_video(source, frame) : NULL;
pthread_mutex_lock(&source->filter_mutex);
if (output)
os_atomic_inc_long(&output->refs);
output = filter_async_video(source, output);
if (output && os_atomic_dec_long(&output->refs) == 0) {
obs_source_frame_destroy(output);
output = NULL;
}
pthread_mutex_unlock(&source->filter_mutex);
/* ------------------------------------------- */
if (output) {
@@ -1969,9 +1970,6 @@ struct obs_source_frame *obs_source_get_frame(obs_source_t *source)
/* reset timing to current system time */
if (frame) {
source->timing_adjust = sys_time - frame->timestamp;
source->timing_set = true;
os_atomic_inc_long(&frame->refs);
}