first beta

Author: cnadler86

src/modcamera.c

@@ -247,7 +247,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, int8_t out_format) {
+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"));
     }
@@ -271,7 +271,7 @@ mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int8_t out_format) {
         return mp_const_none;
     }
 
-    if (out_format >= 0 && (mp_camera_pixformat_t)out_format != self->camera_config.pixel_format) {
+    if (out_format != self->camera_config.pixel_format) {
         switch (out_format) {
             case PIXFORMAT_JPEG:
                 if (frame2jpg(self->captured_buffer, self->camera_config.jpeg_quality, &out_buf, &out_len)) {
@@ -297,20 +297,29 @@ mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int8_t out_format) {
                     return mp_const_none;
                 }
 
-            default:
-                ESP_LOGI(TAG, "Returning image as bitmap");
-                if (frame2bmp(self->captured_buffer, &out_buf, &out_len)) {
-                    esp_camera_fb_return(self->captured_buffer);
-                    mp_obj_t result = mp_obj_new_memoryview('b', out_len, out_buf);
-                    return result;
+            case PIXFORMAT_RGB565:
+                if(self->camera_config.pixel_format == PIXFORMAT_JPEG){
+                    if (jpg2rgb565(self->captured_buffer->buf, self->captured_buffer->len, out_buf, JPG_SCALE_NONE)) {
+                        esp_camera_fb_return(self->captured_buffer);
+                        mp_obj_t result = mp_obj_new_memoryview('b', out_len, out_buf);
+                        return result;
+                    } else {
+                        return mp_const_none;
+                    }
                 } else {
+                    mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Can only convert JPEG to RGB565"));
                     return mp_const_none;
                 }
+
+            default:
+                mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Unsupported pixel format for conversion"));
+                return mp_const_none;
+
         }
     }
 
-    if (self->camera_config.pixel_format == PIXFORMAT_JPEG) {
-        ESP_LOGI(TAG, "Captured image in JPEG format");
+    if (self->bmp_out == false) {
+        ESP_LOGI(TAG, "Returning imgae without conversion");
         return mp_obj_new_memoryview('b', self->captured_buffer->len, self->captured_buffer->buf);
     } else {
         ESP_LOGI(TAG, "Returning image as bitmap");
@@ -319,6 +328,7 @@ mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int8_t out_format) {
             mp_obj_t result = mp_obj_new_memoryview('b', out_len, out_buf);
             return result;
         } else {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to convert image to BMP"));
             return mp_const_none;
         }
     }

src/modcamera.h

@@ -106,6 +106,7 @@ typedef struct hal_camera_obj {
     camera_config_t     camera_config;
     bool                initialized;
     camera_fb_t         *captured_buffer;
+    bool                bmp_out;
 } hal_camera_obj_t;
 
 #endif // CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
@@ -197,7 +198,7 @@ extern void mp_camera_hal_reconfigure(mp_camera_obj_t *self, mp_camera_framesize
  * @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, int8_t out_format);
+extern mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, mp_camera_pixformat_t out_format);
 
 /**
  * @brief Table mapping pixel formats API to their corresponding values at HAL.

src/modcamera_api.c

@@ -40,7 +40,7 @@ const mp_obj_type_t camera_type;
 
 //Constructor
 static mp_obj_t mp_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_sda_pin, ARG_scl_pin, ARG_xclock_pin, ARG_xclock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_fb_count, ARG_grab_mode, ARG_init, NUM_ARGS };
+    enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_sda_pin, ARG_scl_pin, ARG_xclock_pin, ARG_xclock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_fb_count, ARG_grab_mode, ARG_init, ARG_bmp_out, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         #ifdef MICROPY_CAMERA_ALL_REQ_PINS_DEFINED
             { MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY , { .u_obj = MP_ROM_NONE } },
@@ -68,6 +68,7 @@ static mp_obj_t mp_camera_make_new(const mp_obj_type_t *type, size_t n_args, siz
         { MP_QSTR_fb_count, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = MICROPY_CAMERA_FB_COUNT } },
         { MP_QSTR_grab_mode, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = MICROPY_CAMERA_GRAB_MODE } },
         { MP_QSTR_init, MP_ARG_BOOL | MP_ARG_KW_ONLY, { .u_bool = true } },
+        { MP_QSTR_bmp_out, MP_ARG_BOOL | MP_ARG_KW_ONLY, { .u_bool = false } },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -128,6 +129,7 @@ static mp_obj_t mp_camera_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     mp_camera_obj_t *self = mp_obj_malloc_with_finaliser(mp_camera_obj_t, &camera_type);
     self->base.type = &camera_type;
+    self->bmp_out = args[ARG_bmp_out].u_bool;
 
     mp_camera_hal_construct(self, data_pins, xclock_pin, pixel_clock_pin, vsync_pin, href_pin, powerdown_pin, reset_pin, 
         sda_pin, scl_pin, xclock_frequency, pixel_format, frame_size, jpeg_quality, fb_count, grab_mode);
@@ -205,6 +207,20 @@ static mp_obj_t mp_camera_deinit(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_camera_deinit_obj, mp_camera_deinit);
 
+static mp_obj_t camera_get_bmp_out(mp_obj_t self_in) {
+    mp_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(self->bmp_out);
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(camera_get_bmp_out_obj, camera_get_bmp_out);
+
+static mp_obj_t camera_set_bmp_out(mp_obj_t self_in, mp_obj_t arg) {
+    mp_camera_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->bmp_out = mp_obj_is_true(arg);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(camera_set_bmp_out_obj, camera_set_bmp_out);
+
+// Destructor
 static mp_obj_t mp_camera_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     return mp_camera_deinit(args[0]);
@@ -316,6 +332,7 @@ static const mp_rom_map_elem_t camera_camera_locals_table[] = {
     ADD_PROPERTY_TO_TABLE(wpc),
     ADD_PROPERTY_TO_TABLE(raw_gma),
     ADD_PROPERTY_TO_TABLE(lenc),
+    ADD_PROPERTY_TO_TABLE(bmp_out),
 };
 static MP_DEFINE_CONST_DICT(camera_camera_locals_dict, camera_camera_locals_table);