improveents, but still not so good

Author: cnadler86

src/modcamera.c

@@ -37,7 +37,7 @@
 #endif
 
 // Supporting functions
-void raise_micropython_error_from_esp_err(esp_err_t err) {
+static void raise_micropython_error_from_esp_err(esp_err_t err) {
     switch (err) {
         case ESP_OK:
             return;
@@ -80,7 +80,7 @@ static int map(int value, int fromLow, int fromHigh, int toLow, int toHigh) {
     return (int)((int32_t)(value - fromLow) * (toHigh - toLow) / (fromHigh - fromLow) + toLow);
 }
 
-static int get_mapped_jpeg_quality(int8_t quality) {
+static inline int get_mapped_jpeg_quality(int8_t quality) {
     return map(quality, 0, 100, 63, 0);
 }
 
@@ -241,60 +241,80 @@ 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, mp_camera_pixformat_t out_format) {
+mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int8_t out_format) {
     if (!self->initialized) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to capture image: Camera not initialized"));
     }
     if (self->captured_buffer) {
         esp_camera_fb_return(self->captured_buffer);
         self->captured_buffer = NULL;
     }
+    
+    static size_t out_len = 0;
+    static uint8_t *out_buf = NULL;
+    if (out_len>0 || out_buf) {
+        free(out_buf);
+        out_len = 0;
+        out_buf = NULL;
+    }
+
     ESP_LOGI(TAG, "Capturing image");
     self->captured_buffer = esp_camera_fb_get();
-    if (self->captured_buffer) {
+    if (!self->captured_buffer) {
+        ESP_LOGE(TAG, "Failed to capture image");
+        return mp_const_none;
+    }
+    
+    if (out_format >= 0 && (mp_camera_pixformat_t)out_format != self->camera_config.pixel_format) {
         switch (out_format) {
             case PIXFORMAT_JPEG:
-                return mp_const_none;
+                if (frame2jpg(self->captured_buffer, self->camera_config.jpeg_quality, &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;
+                } else {
+                    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);
+                out_len = self->captured_buffer->width * self->captured_buffer->height * 3;
+                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)){
+                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);
+                    mp_obj_t result = mp_obj_new_memoryview('b', out_len, 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);
+                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;
                 } 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;
-                    }
+                    return mp_const_none;
                 }
         }
+    }
+
+    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_camera_fb_return(self->captured_buffer);
-        self->captured_buffer = NULL;
-        return mp_const_none;
+        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;
+        } else {
+            return mp_const_none;
+        }
     }
 }
 
@@ -447,6 +467,7 @@ void mp_camera_hal_set_frame_size(mp_camera_obj_t * self, framesize_t value) {
         self->camera_config.frame_size = value;
     }
 }
+
 int mp_camera_hal_get_quality(mp_camera_obj_t * self) {
     if (!self->initialized) {
         mp_raise_ValueError(MP_ERROR_TEXT("Camera not initialized"));

src/modcamera.h

@@ -197,7 +197,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, hal_camera_pixformat_t out_format);
+extern mp_obj_t mp_camera_hal_capture(mp_camera_obj_t *self, int8_t out_format);
 
 /**
  * @brief Table mapping pixel formats API to their corresponding values at HAL.

src/modcamera_api.c

@@ -134,7 +134,7 @@ static mp_obj_t mp_camera_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     mp_camera_hal_init(self);
 
-    if (mp_camera_hal_capture(self, 100) == mp_const_none){
+    if (mp_camera_hal_capture(self, -1) == mp_const_none){
         mp_camera_hal_deinit(self);
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Failed to capture initial frame. \
         Run reconfigure method or construct a new object with appropriate configuration (e.g. FrameSize)."));
@@ -150,7 +150,7 @@ 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]);
-    uint8_t out_format = n_args < 2 ? MP_ROM_NONE : mp_obj_get_int(args[1]);
+    int8_t out_format = n_args < 2 ? -1 : 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);