From b88fe5078c6172c67d52bf4d01405b9f0ff32c81 Mon Sep 17 00:00:00 2001 From: fryshorts Date: Sat, 26 Jul 2014 16:58:03 +0200 Subject: [PATCH] Remove the getwidth/getheight functions from v4l2 plugin. Those functions are actually causing more problems than helping out with the preview because the width/height is updated immediately while the actual size of the frames displayed changes later. --- plugins/linux-v4l2/v4l2-input.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/plugins/linux-v4l2/v4l2-input.c b/plugins/linux-v4l2/v4l2-input.c index edadc5527..51e1ca84f 100644 --- a/plugins/linux-v4l2/v4l2-input.c +++ b/plugins/linux-v4l2/v4l2-input.c @@ -683,20 +683,6 @@ static obs_properties_t v4l2_properties(void) return props; } -static uint32_t v4l2_getwidth(void *vptr) -{ - V4L2_DATA(vptr); - - return data->width; -} - -static uint32_t v4l2_getheight(void *vptr) -{ - V4L2_DATA(vptr); - - return data->height; -} - static void v4l2_terminate(struct v4l2_data *data) { if (data->thread) { @@ -849,7 +835,5 @@ struct obs_source_info v4l2_input = { .destroy = v4l2_destroy, .update = v4l2_update, .defaults = v4l2_defaults, - .properties = v4l2_properties, - .getwidth = v4l2_getwidth, - .getheight = v4l2_getheight + .properties = v4l2_properties }; -- GitLab