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

Refactor update function for v4l2 input.

Browse Source 
The old implementation of this function assumed that there would be some
settings that could be changed on the fly without restarting the
capture. That was actually never used for any setting.
This commit is contained in:
fryshorts 2014-09-16 20:46:04 +02:00
parent 632642010d
commit 875398e9dd
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,44 +643,30 @@ fail:
v4l2_terminate(data);
}
/**
* Update the settings for the v4l2 source
*
* Since there are very few settings that can be changed without restarting the
* stream we don't bother to even try. Whenever this is called the currently
* active stream (if exists) is stopped, the settings are updated and finally
* the new stream is started.
*/
static void v4l2_update(void *vptr, obs_data_t settings)
{
V4L2_DATA(vptr);
bool restart = false;
const char *new_device;
new_device = obs_data_get_string(settings, "device_id");
if (!data->set_device || strcmp(data->set_device, new_device) != 0) {
if (data->set_device)
bfree(data->set_device);
data->set_device = bstrdup(new_device);
restart = true;
}
v4l2_terminate(data);
if (data->set_input != obs_data_get_int(settings, "input")) {
data->set_input = obs_data_get_int(settings, "input");
restart = true;
}
if (data->set_device)
bfree(data->set_device);
if (data->set_pixfmt != obs_data_get_int(settings, "pixelformat")) {
data->set_pixfmt = obs_data_get_int(settings, "pixelformat");
restart = true;
}
data->set_device = bstrdup(obs_data_get_string(settings, "device_id"));
data->set_input = obs_data_get_int(settings, "input");
data->set_pixfmt = obs_data_get_int(settings, "pixelformat");
data->set_res = obs_data_get_int(settings, "resolution");
data->set_fps = obs_data_get_int(settings, "framerate");
if (data->set_res != obs_data_get_int(settings, "resolution")) {
data->set_res = obs_data_get_int(settings, "resolution");
restart = true;
}
if (data->set_fps != obs_data_get_int(settings, "framerate")) {
data->set_fps = obs_data_get_int(settings, "framerate");
restart = true;
}
if (restart) {
v4l2_terminate(data);
v4l2_init(data);
}
v4l2_init(data);
}
static void *v4l2_create(obs_data_t settings, obs_source_t source)