mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #395 from fryshorts/v4l2-buffering

Browse Source 
linux-v4l2: Replace system timing option
This commit is contained in:
Jim 2015-03-04 23:25:12 -08:00
commit f0370f556a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/linux-v4l2/data/locale/en-US.ini
View File

@ -7,4 +7,4 @@ DVTiming="DV Timing"
Resolution="Resolution"
FrameRate="Frame Rate"
LeaveUnchanged="Leave Unchanged"
UseSystemTiming="Use System Timing"
UseBuffering="Use Buffering"

24
plugins/linux-v4l2/v4l2-input.c
View File

@ -69,7 +69,6 @@ struct v4l2_data {
int dv_timing;
int resolution;
int framerate;
bool sys_timing;
/* internal data */
obs_source_t *source;
@ -188,12 +187,9 @@ static void *v4l2_thread(void *vptr)
break;
}
out.timestamp = data->sys_timing ?
os_gettime_ns() : timeval2ns(buf.timestamp);
out.timestamp = timeval2ns(buf.timestamp);
if (!frames)
first_ts = out.timestamp;
out.timestamp -= first_ts;
start = (uint8_t *) data->buffers.info[buf.index].start;
@ -229,7 +225,7 @@ static void v4l2_defaults(obs_data_t *settings)
obs_data_set_default_int(settings, "dv_timing", -1);
obs_data_set_default_int(settings, "resolution", -1);
obs_data_set_default_int(settings, "framerate", -1);
obs_data_set_default_bool(settings, "system_timing", false);
obs_data_set_default_bool(settings, "buffering", true);
}
/**
@ -738,7 +734,7 @@ static obs_properties_t *v4l2_properties(void *vptr)
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_properties_add_bool(props,
"system_timing", obs_module_text("UseSystemTiming"));
"buffering", obs_module_text("UseBuffering"));
obs_data_t *settings = obs_source_get_settings(data->source);
v4l2_device_list(device_list, settings);
@ -881,6 +877,17 @@ fail:
v4l2_terminate(data);
}
/** Update source flags depending on the settings */
static void v4l2_update_source_flags(struct v4l2_data *data,
obs_data_t *settings)
{
uint32_t flags = obs_source_get_flags(data->source);
flags = (obs_data_get_bool(settings, "buffering"))
? flags & ~OBS_SOURCE_FLAG_UNBUFFERED
: flags | OBS_SOURCE_FLAG_UNBUFFERED;
obs_source_set_flags(data->source, flags);
}
/**
* Update the settings for the v4l2 source
*
@ -905,7 +912,8 @@ static void v4l2_update(void *vptr, obs_data_t *settings)
data->dv_timing = obs_data_get_int(settings, "dv_timing");
data->resolution = obs_data_get_int(settings, "resolution");
data->framerate = obs_data_get_int(settings, "framerate");
data->sys_timing = obs_data_get_bool(settings, "system_timing");
v4l2_update_source_flags(data, settings);
v4l2_init(data);
}