瀏覽代碼

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.
fryshorts 11 年之前
父節點
當前提交
b88fe5078c
共有 1 個文件被更改,包括 1 次插入17 次删除
  1. 1 17
      plugins/linux-v4l2/v4l2-input.c

+ 1 - 17
plugins/linux-v4l2/v4l2-input.c

@@ -683,20 +683,6 @@ static obs_properties_t v4l2_properties(void)
 	return props;
 	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)
 static void v4l2_terminate(struct v4l2_data *data)
 {
 {
 	if (data->thread) {
 	if (data->thread) {
@@ -849,7 +835,5 @@ struct obs_source_info v4l2_input = {
 	.destroy      = v4l2_destroy,
 	.destroy      = v4l2_destroy,
 	.update       = v4l2_update,
 	.update       = v4l2_update,
 	.defaults     = v4l2_defaults,
 	.defaults     = v4l2_defaults,
-	.properties   = v4l2_properties,
-	.getwidth     = v4l2_getwidth,
-	.getheight    = v4l2_getheight
+	.properties   = v4l2_properties
 };
 };