Added a way to use digital zoom while running video stream.

kbarni · Jan 11, 2024 · 9e6ae7b · 9e6ae7b
1 parent 3fe90e5
commit 9e6ae7b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/include/lccv.hpp b/include/lccv.hpp
@@ -28,6 +28,9 @@ class PiCamera {
     bool getVideoFrame(cv::Mat &frame, unsigned int timeout);
     void stopVideo();
 
+    //Applies new zoom options. Before invoking this func modify options->roi.
+    void ApplyZoomOptions();
+
 protected:
     void run();
 protected:

diff --git a/include/libcamera_app.hpp b/include/libcamera_app.hpp
@@ -102,6 +102,8 @@ class LibcameraApp
 	void StartCamera();
 	void StopCamera();
 
+    void ApplyRoiSettings();
+
 	Msg Wait();
 	void PostMessage(MsgType &t, MsgPayload &p);
 

diff --git a/src/lccv.cpp b/src/lccv.cpp
@@ -197,3 +197,8 @@ void *PiCamera::videoThreadFunc(void *p)
     }
     return NULL;
 }
+
+void PiCamera::ApplyZoomOptions()
+{
+    app->ApplyRoiSettings();
+}
diff --git a/src/libcamera_app.cpp b/src/libcamera_app.cpp
@@ -281,6 +281,22 @@ void LibcameraApp::StopCamera()
 		std::cerr << "Camera stopped!" << std::endl;
 }
 
+void LibcameraApp::ApplyRoiSettings(){
+    if (!controls_.get(controls::ScalerCrop) && options_->roi_width != 0 && options_->roi_height != 0)
+    {
+        Rectangle sensor_area = *camera_->properties().get(properties::ScalerCropMaximum);
+        int x = options_->roi_x * sensor_area.width;
+        int y = options_->roi_y * sensor_area.height;
+        int w = options_->roi_width * sensor_area.width;
+        int h = options_->roi_height * sensor_area.height;
+        Rectangle crop(x, y, w, h);
+        crop.translateBy(sensor_area.topLeft());
+        if (options_->verbose)
+            std::cerr << "Using crop " << crop.toString() << std::endl;
+        controls_.set(controls::ScalerCrop, crop);
+    }
+}
+
 LibcameraApp::Msg LibcameraApp::Wait()
 {
 	return msg_queue_.Wait();