camera api not good enough

Author: cnadler86

src/modcamera.c

@@ -28,6 +28,7 @@
 #include "modcamera.h"
 #include "esp_err.h"
 #include "esp_log.h"
+#include "img_converters.h"
 
 #define TAG "ESP32_MPY_CAMERA"
 
@@ -240,8 +241,7 @@ void mp_camera_hal_reconfigure(mp_camera_obj_t *self, mp_camera_framesize_t fram
     }
 }
 
-mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int timeout_ms) {
-    // Timeout not used at the moment
+mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, mp_camera_pixformat_t out_format) {
     if (!self->initialized) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to capture image: Camera not initialized"));
     }
@@ -252,20 +252,44 @@ mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int timeout_ms) {
     ESP_LOGI(TAG, "Capturing image");
     self->captured_buffer = esp_camera_fb_get();
     if (self->captured_buffer) {
-        if (self->camera_config.pixel_format == PIXFORMAT_JPEG) {
-            ESP_LOGI(TAG, "Captured image in JPEG format");
-            return mp_obj_new_memoryview('b', self->captured_buffer->len, self->captured_buffer->buf);
-        } else {
-            ESP_LOGI(TAG, "Captured image in raw format");
-            return mp_obj_new_memoryview('b', self->captured_buffer->len, self->captured_buffer->buf);
-            // TODO: Stub at the moment in order to return raw data, but it sould be implemented to return a Bitmap, see following circuitpython example:
-            //
-            // int width = common_hal_espcamera_camera_get_width(self);
-            // int height = common_hal_espcamera_camera_get_height(self);
-            // displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t);
-            // bitmap->base.type = &displayio_bitmap_type;
-            // common_hal_displayio_bitmap_construct_from_buffer(bitmap, width, height, (format == PIXFORMAT_RGB565) ? 16 : 8, (uint32_t *)(void *)result->buf, true);
-            // return bitmap;
+        switch (out_format) {
+            case PIXFORMAT_JPEG:
+                return mp_const_none;
+
+            case PIXFORMAT_RGB888:
+                size_t out_len = self->captured_buffer->width * self->captured_buffer->height * 3;
+                uint8_t *out_buf = (uint8_t *)malloc(out_len);
+                if (!out_buf) {
+                    ESP_LOGE(TAG, "out_buf malloc failed");
+                    return mp_const_none;
+                }
+                if (fmt2rgb888(self->captured_buffer->buf, self->captured_buffer->len, self->captured_buffer->format, out_buf)){
+                    esp_camera_fb_return(self->captured_buffer);
+                    mp_obj_t result = mp_obj_new_bytes(out_buf, out_len);
+                    free(out_buf);
+                    return result;
+                } else {
+                    free(out_buf);
+                    return mp_const_none;
+                }
+                
+            default:
+                if (self->camera_config.pixel_format == PIXFORMAT_JPEG) {
+                    ESP_LOGI(TAG, "Captured image in JPEG format");
+                    return mp_obj_new_memoryview('b', self->captured_buffer->len, self->captured_buffer->buf);
+                } else {
+                    ESP_LOGI(TAG, "Returning image as bitmap");
+                    uint8_t *out = NULL;
+                    size_t out_len = 0;
+                    if (frame2bmp(self->captured_buffer, &out, &out_len)) {
+                        esp_camera_fb_return(self->captured_buffer);
+                        mp_obj_t result = mp_obj_new_bytes(out, out_len);
+                        free(out);
+                        return result;
+                    } else {
+                        return mp_const_none;
+                    }
+                }
         }
     } else {
         esp_camera_fb_return(self->captured_buffer);
@@ -283,6 +307,7 @@ const mp_rom_map_elem_t mp_camera_hal_pixel_format_table[] = {
     { MP_ROM_QSTR(MP_QSTR_YUV422),          MP_ROM_INT(PIXFORMAT_YUV422) },
     { MP_ROM_QSTR(MP_QSTR_GRAYSCALE),       MP_ROM_INT(PIXFORMAT_GRAYSCALE) },
     { MP_ROM_QSTR(MP_QSTR_RGB565),          MP_ROM_INT(PIXFORMAT_RGB565) },
+    { MP_ROM_QSTR(MP_QSTR_RGB888),          MP_ROM_INT(PIXFORMAT_RGB888) },
 };
 
 const mp_rom_map_elem_t mp_camera_hal_frame_size_table[] = {

src/modcamera.h

@@ -194,16 +194,16 @@ extern void mp_camera_hal_reconfigure(mp_camera_obj_t *self, mp_camera_framesize
  * @brief Captures an image and returns it as mp_obj_t (e.g. mp_obj_new_memoryview).
  * 
  * @param self Pointer to the camera object.
- * @param timeout_ms Timeout in milliseconds.
+ * @param out_format Output pixelformat format.
  * @return Captured image as micropython object.
  */
-extern mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int timeout_ms);
+extern mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, hal_camera_pixformat_t out_format);
 
 /**
  * @brief Table mapping pixel formats API to their corresponding values at HAL.
  * @details Needs to be defined in the port-specific implementation.
  */
-extern const mp_rom_map_elem_t mp_camera_hal_pixel_format_table[4];
+extern const mp_rom_map_elem_t mp_camera_hal_pixel_format_table[5];
 
 /**
  * @brief Table mapping frame sizes API to their corresponding values at HAL.

src/modcamera_api.c

@@ -150,8 +150,8 @@ static mp_obj_t mp_camera_make_new(const mp_obj_type_t *type, size_t n_args, siz
 // Main methods
 static mp_obj_t camera_capture(size_t n_args, const mp_obj_t *args){
     mp_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]);
-    return mp_camera_hal_capture(self, timeout);
+    uint8_t out_format = n_args < 2 ? MP_ROM_NONE : mp_obj_get_int(args[1]);
+    return mp_camera_hal_capture(self, out_format);
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(camera_capture_obj, 1, 2, camera_capture);
 
@@ -211,8 +211,8 @@ static mp_obj_t mp_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_camera___exit___obj, 4, 4, mp_camera_obj___exit__);
 
-// Camera propertiy functions
-// Camera sensor propertiy functions
+// Camera property functions
+// Camera sensor property functions
 #define CREATE_GETTER(property, get_function) \
     static mp_obj_t camera_get_##property(const mp_obj_t self_in) { \
         mp_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); \