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

Revert "Add flag to obs_source_frame for unbuffered video"

Browse Source 
This reverts commit c3f4b0f018.

The obs_source_frame should not need to take flags to do this.  This
shouldn't be a setting associated with the frame, but rather a setting
associated with the source itself.  This was the wrong approach to
solving this particular problem.
This commit is contained in:
jp9000
2014-10-23 07:27:04 -07:00
parent ae0f6b5e3f
commit db81c59b5e
6 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libobs/obs-source.c
View File

@@ -1606,17 +1606,6 @@ static bool ready_async_frame(obs_source_t *source, uint64_t sys_time)
uint64_t frame_time = next_frame->timestamp;
uint64_t frame_offset = 0;
while ((next_frame->flags & OBS_VIDEO_UNBUFFERED) != 0 &&
source->video_frames.num > 1) {
da_erase(source->video_frames, 0);
obs_source_frame_destroy(next_frame);
next_frame = source->video_frames.array[0];
}
if ((next_frame->flags & OBS_VIDEO_UNBUFFERED) != 0)
return true;
#if DEBUG_ASYNC_FRAMES
blog(LOG_DEBUG, "source->last_frame_ts: %llu, frame_time: %llu, "
"sys_offset: %llu, frame_offset: %llu, "

4
libobs/obs.h
View File

@@ -174,9 +174,6 @@ struct obs_source_audio {
uint64_t timestamp;
};
/** Specifies that the video frame should be played as soon as possible */
#define OBS_VIDEO_UNBUFFERED (1<<0)
/**
* Source asynchronous video output structure. Used with
* obs_source_output_video to output asynchronous video. Video is buffered as
@@ -192,7 +189,6 @@ struct obs_source_frame {
uint32_t width;
uint32_t height;
uint64_t timestamp;
uint32_t flags;
enum video_format format;
float color_matrix[16];