libcameradevice is a videoframeinput

Author: saeugetier

qml/Application.qml

@@ -72,16 +72,6 @@ ApplicationWindow {
 
     Libcamera {
        id: libcamera
-
-       onErrorOccurred: function(errorString) {
-          if(state === "Libcamera")
-          {
-             cameraSource.errorOccurred(errorString)
-          }
-       }
-       onImageCaptured: function(image) {
-          cameraSource.imageCaptured(image)
-       }
     }
 
     ApplicationFlow

qml/content/CameraSource.qml

@@ -40,7 +40,6 @@ Item
       var libcameras = libcamera.availableCameras()
       for (var j = 0; j < libcameras.length; j++) {
          if (libcameras[j] === cameraName) {
-            libcamera.cameraName = cameraName
             cameraSource.state = "Libcamera"
             console.log("CameraSource using Libcamera camera device: " + cameraName)
             return
@@ -61,6 +60,10 @@ Item
       {
          //gphotoCamera.startCamera()
       }
+      else if(state === "Libcamera")
+      {
+         libcamera.startCamera(cameraName)
+      }
       else
       {
          console.log("No camera available to start!")
@@ -77,6 +80,10 @@ Item
       {
          //gphotoCamera.stopCamera()
       }
+      else if(state === "Libcamera")
+      {
+         libcamera.stopCamera()
+      }
       else
       {
          console.log("No camera available to stop!")
@@ -105,6 +112,24 @@ Item
       id: mediaDevices
    }
 
+   Connections {
+      target: libcamera
+      function errorOccured(errorString) {
+         if(state === "Libcamera")
+         {
+            cameraSource.errorOccurred(errorString)
+         }
+      }
+   }
+
+   Connections
+   {
+      target: libcamera
+      function imageCaptured(image) {
+            cameraSource.imageCaptured(image)
+         }
+   }
+
    GPhotoCamera {
       id: gphotoCamera
 

src/libcameracamera.cpp

@@ -11,7 +11,7 @@
 using namespace libcamera;
 
 LibcameraDevice::LibcameraDevice(QObject *parent)
-    : QObject(parent),
+    : QVideoFrameInput(parent),
       mWorkerThread(std::make_unique<QThread>(this))
 {
     // Create worker
@@ -158,6 +158,8 @@ void LibCameraWorker::startCamera(const QString &cameraId)
     }
     mCamera = cam;
 
+    mCamera->acquire();
+
     // configure camera for viewfinder role (basic example)
     std::unique_ptr<CameraConfiguration> config =
         mCamera->generateConfiguration({ StreamRole::Viewfinder });

src/libcameracamera.h

@@ -4,6 +4,7 @@
 #include <QTimer>
 #include <QStringList>
 #include <memory>
+#include <QVideoFrameInput>
 
 #undef emit
 #undef slots
@@ -17,7 +18,7 @@
 
 class LibCameraWorker;
 
-class LibcameraDevice : public QObject
+class LibcameraDevice : public QVideoFrameInput
 {
     Q_OBJECT
 public: