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

Merge pull request #3160 from julijane/v4l2-fix-case

Browse Source 
linux-v4l2: Fix case of variables
This commit is contained in:
Jim 2020-07-13 13:47:55 -07:00 committed by GitHub
commit 56e67e545e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,8 @@ struct v4l2_data {
pthread_t thread; pthread_t thread;
os_event_t *event; os_event_t *event;
bool framerateUnchanged; bool framerate_unchanged;
bool resolutionUnchanged; bool resolution_unchanged;
int_fast32_t dev; int_fast32_t dev;
int width; int width;
int height; int height;
@ -976,28 +976,28 @@ static bool v4l2_settings_changed(struct v4l2_data *data, obs_data_t *settings)
obs_data_get_int(settings, "dv_timing"); obs_data_get_int(settings, "dv_timing");
if (obs_data_get_int(settings, "resolution") == -1 && if (obs_data_get_int(settings, "resolution") == -1 &&
!data->resolutionUnchanged) { !data->resolution_unchanged) {
data->resolutionUnchanged = true; data->resolution_unchanged = true;
res |= true; res |= true;
} else if (obs_data_get_int(settings, "resolution") == -1 && } else if (obs_data_get_int(settings, "resolution") == -1 &&
data->resolutionUnchanged) { data->resolution_unchanged) {
res |= false; res |= false;
} else { } else {
data->resolutionUnchanged = false; data->resolution_unchanged = false;
res |= (data->resolution != res |= (data->resolution !=
obs_data_get_int(settings, "resolution")) && obs_data_get_int(settings, "resolution")) &&
(obs_data_get_int(settings, "resolution") != -1); (obs_data_get_int(settings, "resolution") != -1);
} }
if (obs_data_get_int(settings, "framerate") == -1 && if (obs_data_get_int(settings, "framerate") == -1 &&
!data->framerateUnchanged) { !data->framerate_unchanged) {
data->framerateUnchanged = true; data->framerate_unchanged = true;
res |= true; res |= true;
} else if (obs_data_get_int(settings, "framerate") == -1 && } else if (obs_data_get_int(settings, "framerate") == -1 &&
data->framerateUnchanged) { data->framerate_unchanged) {
res |= false; res |= false;
} else { } else {
data->framerateUnchanged = false; data->framerate_unchanged = false;
res |= (data->framerate != res |= (data->framerate !=
obs_data_get_int(settings, "framerate")) && obs_data_get_int(settings, "framerate")) &&
(obs_data_get_int(settings, "framerate") != -1); (obs_data_get_int(settings, "framerate") != -1);
@ -1052,8 +1052,8 @@ static void *v4l2_create(obs_data_t *settings, obs_source_t *source)
struct v4l2_data *data = bzalloc(sizeof(struct v4l2_data)); struct v4l2_data *data = bzalloc(sizeof(struct v4l2_data));
data->dev = -1; data->dev = -1;
data->source = source; data->source = source;
data->resolutionUnchanged = false; data->resolution_unchanged = false;
data->framerateUnchanged = false; data->framerate_unchanged = false;
/* Bitch about build problems ... */ /* Bitch about build problems ... */
#ifndef V4L2_CAP_DEVICE_CAPS #ifndef V4L2_CAP_DEVICE_CAPS