Updated with first set of CR changes on the Zephyr side

Author: KurtE

libraries/Camera/src/camera.cpp

@@ -32,15 +32,18 @@ uint32_t FrameBuffer::getBufferSize() {
     if (this->vbuf) {
         return this->vbuf->bytesused;
     }
+    return 0;
 }
 
 uint8_t* FrameBuffer::getBuffer() {
     if (this->vbuf) {
         return this->vbuf->buffer;
     }
+    return nullptr;
 }
 
-Camera::Camera() : vdev(NULL), byte_swap(false), yuv_to_gray(false) {
+Camera::Camera() : vdev(NULL), byte_swap(false), yuv_to_gray(false),
+         snapshot_mode(CONFIG_VIDEO_BUFFER_POOL_NUM_MAX <= 1) {
 	for (size_t i = 0; i < ARRAY_SIZE(this->vbuf); i++) {
 		this->vbuf[i] = NULL;
     }
@@ -95,6 +98,7 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t crop_width, uint32_
 
     // Set format.
     static struct video_format fmt = {
+        .type = VIDEO_BUF_TYPE_OUTPUT,
         .pixelformat = pixformat,
         .width = width,
         .height = height,
@@ -124,6 +128,16 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t crop_width, uint32_
     // this should compute the sizes needed.
     video_get_format(this->vdev, &fmt);
 
+
+    // If we are in snapshot mode, try starting the video stream with no buffers
+    // to tell it that we want snapshot...
+    if (snapshot_mode) {
+        if (video_stream_start(this->vdev, VIDEO_BUF_TYPE_OUTPUT)) {
+            Serial.println("Snapshot mode Failed to start capture");
+            //return false;
+        }
+    }
+
 	// Allocate video buffers.
 	for (size_t i = 0; i < ARRAY_SIZE(this->vbuf); i++) {
 		this->vbuf[i] = video_buffer_aligned_alloc(fmt.pitch * fmt.height,
@@ -137,11 +151,12 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t crop_width, uint32_
 	}
 
 	// Start video capture
-	if (video_stream_start(this->vdev, VIDEO_BUF_TYPE_OUTPUT)) {
-        Serial.println("Failed to start capture");
-		return false;
-	}
-
+    if (!snapshot_mode) {
+    	if (video_stream_start(this->vdev, VIDEO_BUF_TYPE_OUTPUT)) {
+            Serial.println("Failed to start capture");
+    		return false;
+    	}
+    }
     return true;
 }
 
@@ -179,7 +194,7 @@ bool Camera::releaseFrame(FrameBuffer &fb) {
 
     int ret;
     //printk("Camera::ReleaseFrame called\n");
-    if (ret = video_enqueue(this->vdev, fb.vbuf)) {
+    if ((ret = video_enqueue(this->vdev, fb.vbuf)) != 0) {
         printk("Failed to enqueue buffer %d\n", ret);
         return false;
 	}
@@ -226,22 +241,28 @@ int Camera::getSelection(struct video_selection *sel) {
  *
  * @param snapshot_mode pointer to Turn Snaphsot mode on or off..
  */
-int Camera::getSnapshotMode(bool *snapshot_mode) {            
-    #if DT_HAS_CHOSEN(zephyr_camera)
-    this->vdev = DEVICE_DT_GET(DT_CHOSEN(zephyr_camera));
-    #endif
-    return video_get_snapshot_mode(vdev, snapshot_mode);
+bool Camera::getSnapshotMode() {
+    return snapshot_mode;
 }
 
 /**
- * @brief Function pointer type for video_set_snapshot_mode()
+ * @brief returns if snapshot mode is turned on or off.
+ * 
+ * Must be called before begin to take effect.
+ * 
+ * @param snap_shot mode if true.
  *
- * @param snapshot_mode Turn Snaphsot mode on or off..
+ * @retval 0 is successful.
  */
-int Camera::setSnapshotMode(bool snapshot_mode) {
-    #if DT_HAS_CHOSEN(zephyr_camera)
-    this->vdev = DEVICE_DT_GET(DT_CHOSEN(zephyr_camera));
-    #endif
-    return video_set_snapshot_mode(vdev, snapshot_mode);
+int Camera::setSnapshotMode(bool snap_shot) {
+    if (snap_shot) {
+        snapshot_mode = snap_shot;
+        return 0;
+    } else {
+        #if CONFIG_VIDEO_BUFFER_POOL_NUM_MAX <= 1
+        return -EINVAL;
+        #endif
+        snapshot_mode = snap_shot;
+        return 0;
+    }
 }
-

libraries/Camera/src/camera.h

@@ -75,6 +75,7 @@ class Camera {
         const struct device *vdev;
         bool byte_swap;
         bool yuv_to_gray;
+        bool snapshot_mode;
         struct video_buffer *vbuf[CONFIG_VIDEO_BUFFER_POOL_NUM_MAX];
 
     public:
@@ -182,16 +183,20 @@ class Camera {
         /**
          * @brief returns if snapshot mode is turned on or off.
          *
-         * @param snapshot_mode pointer to Turn Snaphsot mode on or off..
+         * @retval true if in snapshot mode false otherwise.
          */
-        int getSnapshotMode(bool *snapshot_mode);
+        bool getSnapshotMode();
 
         /**
-         * @brief Function pointer type for video_set_snapshot_mode()
+         * @brief returns if snapshot mode is turned on or off.
+         * 
+         * Must be called before begin to take effect.
+         * 
+         * @param snap_shot mode if true.
          *
-         * @param snapshot_mode Turn Snaphsot mode on or off..
+         * @retval 0 is successful.
          */
-        int setSnapshotMode(bool snapshot_mode);
+        int setSnapshotMode(bool snap_shot);
 };
 
 #endif // __CAMERA_H__