Separate setResolutionWithZoom() and setResolution()

Alrik Vidstrom · sebromero · commit 36fd82bba8dd · 2023-05-26T10:37:31.000+02:00
Adds back the setResolution() function to the camera drivers by
calling setResolutionWithZoom() with default parameters.
diff --git a/libraries/Camera/src/camera.cpp b/libraries/Camera/src/camera.cpp
@@ -547,7 +547,7 @@ int Camera::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, i
     }
     HAL_DCMI_ConfigCROP(&hdcmi, 0, 0, bpl - 1, restab[final_resolution][1] - 1);
 
-    if (this->sensor->setResolution(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {
+    if (this->sensor->setResolutionWithZoom(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {
         this->resolution = final_resolution;
         return 0;
     }
diff --git a/libraries/Camera/src/camera.h b/libraries/Camera/src/camera.h
@@ -215,7 +215,9 @@ class ImageSensor {
          * @param zoom_y The desired y position of the zoom window.
          * @return int 0 on success, non-zero on failure
          */
-        virtual int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y) = 0;
+        virtual int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y) = 0;
+
+        virtual int setResolution(int32_t resolution) = 0;
 
         /**
          * @brief Set the pixel (color) format of the image sensor.
@@ -531,7 +533,7 @@ class Camera {
         int zoomTo(int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
         int zoomToCenter(int32_t zoom_resolution);
         int setVerticalFlip(bool flip_enable);
-        int setHorizontalMirror(bool mirror_enable;
+        int setHorizontalMirror(bool mirror_enable);
         uint32_t getResolutionWidth();
         uint32_t getResolutionHeight();
 
diff --git a/libraries/GC2145/gc2145.cpp b/libraries/GC2145/gc2145.cpp
@@ -787,7 +787,12 @@ int GC2145::setHorizontalMirror(bool mirror_enable)
     return ((0 == retVal) ? 0 : -1);
 }
 
-int GC2145::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int GC2145::setResolution(int32_t resolution)
+{
+    setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int GC2145::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
     int ret = 0;
 
diff --git a/libraries/GC2145/gc2145.h b/libraries/GC2145/gc2145.h
@@ -39,7 +39,8 @@ class GC2145: public ImageSensor {
         bool getMono() { return false; };
         uint32_t getClockFrequency() { return 12000000; };
         int setFrameRate(int32_t framerate);
-        int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolution(int32_t resolution);
         int setPixelFormat(int32_t pixformat);
         int enableMotionDetection(md_callback_t callback) { return 0; };
         int disableMotionDetection() { return 0; };
@@ -50,5 +51,5 @@ class GC2145: public ImageSensor {
         int setHorizontalMirror(bool mirror_enable);
         void debug(Stream &stream);
 };
- 
+
 #endif /* __GC2145_H */
diff --git a/libraries/Himax_HM01B0/himax.cpp b/libraries/Himax_HM01B0/himax.cpp
@@ -351,7 +351,12 @@ int HM01B0::setHorizontalMirror(bool mirror_enable)
   return -1;
 }
 
-int HM01B0::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int HM01B0::setResolution(int32_t resolution)
+{
+    setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int HM01B0::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
   int ret = 0;
 
diff --git a/libraries/Himax_HM01B0/himax.h b/libraries/Himax_HM01B0/himax.h
@@ -40,7 +40,8 @@ class HM01B0: public ImageSensor {
         bool getMono() { return true; };
         uint32_t getClockFrequency() { return 6000000; };
         int setFrameRate(int32_t framerate);
-        int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolution(int32_t resolution);
         int setPixelFormat(int32_t pixformat);
         int setTestPattern(bool enable, bool walking) override;
         int enableMotionDetection(md_callback_t callback=NULL);
diff --git a/libraries/Himax_HM0360/hm0360.cpp b/libraries/Himax_HM0360/hm0360.cpp
@@ -596,7 +596,12 @@ int HM0360::setHorizontalMirror(bool mirror_enable)
   return -1;
 }
 
-int HM0360::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int HM0360::setResolution(int32_t resolution)
+{
+    setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int HM0360::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
     int ret = 0;
 
diff --git a/libraries/Himax_HM0360/hm0360.h b/libraries/Himax_HM0360/hm0360.h
@@ -40,7 +40,8 @@ class HM0360: public ImageSensor {
         bool getMono() { return true; };
         uint32_t getClockFrequency() { return 24000000; };
         int setFrameRate(int32_t framerate);
-        int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolution(int32_t resolution);
         int setPixelFormat(int32_t pixformat);
         int setTestPattern(bool enable, bool walking) override;
         int enableMotionDetection(md_callback_t callback=NULL);
diff --git a/libraries/OV7670/ov7670.cpp b/libraries/OV7670/ov7670.cpp
@@ -707,7 +707,12 @@ int OV7670::setHorizontalMirror(bool mirror_enable)
   return -1;
 }
 
-int OV7670::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int OV7670::setResolution(int32_t resolution)
+{
+    setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int OV7670::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
     int ret = 0;
 
diff --git a/libraries/OV7670/ov767x.h b/libraries/OV7670/ov767x.h
@@ -45,7 +45,8 @@ class OV7670: public ImageSensor {
         bool getMono() { return false; };
         uint32_t getClockFrequency() { return 12000000; };
         int setFrameRate(int32_t framerate);
-        int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+        int setResolution(int32_t resolution);
         int setPixelFormat(int32_t pixformat);
         int enableMotionDetection(md_callback_t callback) { return 0; };
         int disableMotionDetection() { return 0; };

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ int Camera::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, i`
`547`	`547`	`}`
`548`	`548`	`HAL_DCMI_ConfigCROP(&hdcmi, 0, 0, bpl - 1, restab[final_resolution][1] - 1);`
`549`	`549`
`550`		`- if (this->sensor->setResolution(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {`
	`550`	`+ if (this->sensor->setResolutionWithZoom(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {`
`551`	`551`	`this->resolution = final_resolution;`
`552`	`552`	`return 0;`
`553`	`553`	`}`
Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,12 @@ int GC2145::setHorizontalMirror(bool mirror_enable)`
`787`	`787`	`return ((0 == retVal) ? 0 : -1);`
`788`	`788`	`}`
`789`	`789`
`790`		`-int GC2145::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
	`790`	`+int GC2145::setResolution(int32_t resolution)`
	`791`	`+{`
	`792`	`+ setResolutionWithZoom(resolution, resolution, 0, 0);`
	`793`	`+}`
	`794`	`+`
	`795`	`+int GC2145::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
`791`	`796`	`{`
`792`	`797`	`int ret = 0;`
`793`	`798`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,12 @@ int HM01B0::setHorizontalMirror(bool mirror_enable)`
`351`	`351`	`return -1;`
`352`	`352`	`}`
`353`	`353`
`354`		`-int HM01B0::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
	`354`	`+int HM01B0::setResolution(int32_t resolution)`
	`355`	`+{`
	`356`	`+ setResolutionWithZoom(resolution, resolution, 0, 0);`
	`357`	`+}`
	`358`	`+`
	`359`	`+int HM01B0::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
`355`	`360`	`{`
`356`	`361`	`int ret = 0;`
`357`	`362`
Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,12 @@ int HM0360::setHorizontalMirror(bool mirror_enable)`
`596`	`596`	`return -1;`
`597`	`597`	`}`
`598`	`598`
`599`		`-int HM0360::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
	`599`	`+int HM0360::setResolution(int32_t resolution)`
	`600`	`+{`
	`601`	`+ setResolutionWithZoom(resolution, resolution, 0, 0);`
	`602`	`+}`
	`603`	`+`
	`604`	`+int HM0360::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
`600`	`605`	`{`
`601`	`606`	`int ret = 0;`
`602`	`607`
Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,12 @@ int OV7670::setHorizontalMirror(bool mirror_enable)`
`707`	`707`	`return -1;`
`708`	`708`	`}`
`709`	`709`
`710`		`-int OV7670::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
	`710`	`+int OV7670::setResolution(int32_t resolution)`
	`711`	`+{`
	`712`	`+ setResolutionWithZoom(resolution, resolution, 0, 0);`
	`713`	`+}`
	`714`	`+`
	`715`	`+int OV7670::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)`
`711`	`716`	`{`
`712`	`717`	`int ret = 0;`
`713`	`718`