Refactor nuttx v4l2

Adjust the v4l2 framework to support both capture and v4l2m2m, and can easily add other v4l2 features. Signed-off-by: shizhenghui <[email protected]>
shizhenghui · Mar 12, 2024 · 27a2984 · 27a2984
1 parent ec42eed
commit 27a2984
Show file tree

Hide file tree

Showing 8 changed files with 3,018 additions and 2,262 deletions.
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
@@ -47,7 +47,7 @@
 #include <nuttx/serial/uart_rpmsg.h>
 #include <nuttx/timers/oneshot.h>
 #include <nuttx/video/fb.h>
-#include <nuttx/video/video.h>
+#include <nuttx/video/v4l2_cap.h>
 #include <nuttx/timers/oneshot.h>
 #include <nuttx/wireless/pktradio.h>
 #include <nuttx/wireless/bluetooth/bt_null.h>
@@ -300,10 +300,10 @@ int sim_bringup(void)
 
   sim_camera_initialize();
 
-  ret = video_initialize(CONFIG_SIM_CAMERA_DEV_PATH);
+  ret = capture_initialize(CONFIG_SIM_CAMERA_DEV_PATH);
   if (ret < 0)
     {
-      syslog(LOG_ERR, "ERROR: video_initialize() failed: %d\n", ret);
+      syslog(LOG_ERR, "ERROR: capture_initialize() failed: %d\n", ret);
     }
 
 #endif

diff --git a/drivers/video/CMakeLists.txt b/drivers/video/CMakeLists.txt
@@ -29,7 +29,7 @@ if(CONFIG_DRIVERS_VIDEO)
   endif()
 
   if(CONFIG_VIDEO_STREAM)
-    list(APPEND SRCS video.c video_framebuff.c)
+    list(APPEND SRCS v4l2_core.c video_framebuff.c v4l2_cap.c)
   endif()
 
   # These video drivers depend on I2C support

diff --git a/drivers/video/Make.defs b/drivers/video/Make.defs
@@ -27,7 +27,7 @@ ifeq ($(CONFIG_VIDEO_FB),y)
 endif
 
 ifeq ($(CONFIG_VIDEO_STREAM),y)
-  CSRCS += video.c video_framebuff.c
+  CSRCS += v4l2_core.c video_framebuff.c v4l2_cap.c
 endif
 
 # These video drivers depend on I2C support

diff --git a/drivers/video/goldfish_camera.c b/drivers/video/goldfish_camera.c
@@ -34,6 +34,7 @@
 #include <nuttx/video/imgsensor.h>
 #include <nuttx/video/imgdata.h>
 #include <nuttx/video/video.h>
+#include <nuttx/video/v4l2_cap.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -779,10 +780,7 @@ int goldfish_camera_initialize(void)
           snprintf(devpath, sizeof(devpath), "/dev/video%zd", i);
         }
 
-      video_register(devpath,
-                     &priv[i]->data,
-                     &sensor,
-                     1);
+      capture_register(devpath, &priv[i]->data, &sensor, 1);
     }
 
   return 0;