add qrdecode_rgb565

2026-05-20 11:51:27 -07:00 · 2025-05-14 22:38:31 +02:00
parent 2534efbd5f
commit 5a05457ef6
1 changed files with 59 additions and 58 deletions
@@ -1,119 +1,81 @@
 #include <stdio.h>
-#include <stdlib.h> // For malloc and free
+#include <stdlib.h>
 #include <string.h>
-
+#include <stdint.h>
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"

 #ifdef __xtensa__
-#include "freertos/FreeRTOS.h" // For uxTaskGetStackHighWaterMark
-#include "freertos/task.h"     // For task-related functions
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 #else
 size_t uxTaskGetStackHighWaterMark(void * unused) {
    return 99999999;
 }
-#endif // __xtensa__
+#endif

 #include "../quirc/lib/quirc.h"

-#define QRDECODE_DEBUG_PRINT(...) mp_printf(&mp_plat_print, __VA_ARGS__);
+#define QRDECODE_DEBUG_PRINT(...) mp_printf(&mp_plat_print, __VA_ARGS__)

-// Function to decode a QR code from a grayscale image buffer
 static mp_obj_t qrdecode(mp_uint_t n_args, const mp_obj_t *args) {
    QRDECODE_DEBUG_PRINT("qrdecode: Starting\n");
    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));

-    // Check argument count (expecting buffer, width, height)
-    QRDECODE_DEBUG_PRINT("qrdecode: Checking argument count\n");
    if (n_args != 3) {
        mp_raise_ValueError(MP_ERROR_TEXT("quirc_decode expects 3 arguments: buffer, width, height"));
    }

-    // Extract buffer
-    QRDECODE_DEBUG_PRINT("qrdecode: Extracting buffer\n");
    mp_buffer_info_t bufinfo;
    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);

-    // Extract width and height
-    QRDECODE_DEBUG_PRINT("qrdecode: Extracting width and height\n");
    mp_int_t width = mp_obj_get_int(args[1]);
    mp_int_t height = mp_obj_get_int(args[2]);
    QRDECODE_DEBUG_PRINT("qrdecode: Width=%u, Height=%u\n", width, height);

-    // Validate dimensions
-    QRDECODE_DEBUG_PRINT("qrdecode: Validating dimensions\n");
    if (width <= 0 || height <= 0) {
        mp_raise_ValueError(MP_ERROR_TEXT("width and height must be positive"));
    }
    if (bufinfo.len != (size_t)(width * height)) {
        mp_raise_ValueError(MP_ERROR_TEXT("buffer size must match width * height"));
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: Dimensions validated\n");

-    // Initialize quirc
-    QRDECODE_DEBUG_PRINT("qrdecode: Initializing quirc\n");
    struct quirc *qr = quirc_new();
    if (!qr) {
        mp_raise_OSError(MP_ENOMEM);
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: quirc initialized\n");

-    // Resize quirc for the image dimensions
-    QRDECODE_DEBUG_PRINT("qrdecode: Resizing quirc\n");
    if (quirc_resize(qr, width, height) < 0) {
        quirc_destroy(qr);
        mp_raise_OSError(MP_ENOMEM);
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: quirc resized\n");

-    // Get quirc image buffer and copy grayscale data
-    QRDECODE_DEBUG_PRINT("qrdecode: Beginning quirc processing\n");
    uint8_t *image;
    quirc_begin(qr, NULL, NULL);
-    image = quirc_begin(qr, NULL, NULL); // Get pointer to quirc's image buffer
-    QRDECODE_DEBUG_PRINT("qrdecode: quirc image buffer obtained\n");
-    QRDECODE_DEBUG_PRINT("qrdecode: Copying buffer, size=%u\n", (size_t)(width * height));
+    image = quirc_begin(qr, NULL, NULL);
    memcpy(image, bufinfo.buf, width * height);
-    QRDECODE_DEBUG_PRINT("qrdecode: Buffer copied\n");
    quirc_end(qr);
-    QRDECODE_DEBUG_PRINT("qrdecode: quirc processing ended\n");

-    // Check for QR codes
-    QRDECODE_DEBUG_PRINT("qrdecode: Counting QR codes\n");
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
    int count = quirc_count(qr);
-    QRDECODE_DEBUG_PRINT("qrdecode: Found %d QR codes\n", count);
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
    if (count == 0) {
        quirc_destroy(qr);
        mp_raise_ValueError(MP_ERROR_TEXT("no QR code found"));
    }

-    // Extract and decode the first QR code
-    QRDECODE_DEBUG_PRINT("qrdecode: Extracting first QR code\n");
    struct quirc_code *code = (struct quirc_code *)malloc(sizeof(struct quirc_code));
    if (!code) {
        quirc_destroy(qr);
        mp_raise_OSError(MP_ENOMEM);
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: Allocated quirc_code on heap\n");
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
    quirc_extract(qr, 0, code);
-    QRDECODE_DEBUG_PRINT("qrdecode: QR code extracted\n");
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
-    // it works until here!

-    // Decode the QR code - this is the part that fails:
-    QRDECODE_DEBUG_PRINT("qrdecode: Decoding QR code\n");
    struct quirc_data *data = (struct quirc_data *)malloc(sizeof(struct quirc_data));
    if (!data) {
        free(code);
        quirc_destroy(qr);
        mp_raise_OSError(MP_ENOMEM);
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: Allocated quirc_data on heap\n");
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
    int err = quirc_decode(code, data);
    if (err != QUIRC_SUCCESS) {
        free(data);
@@ -121,36 +83,76 @@ static mp_obj_t qrdecode(mp_uint_t n_args, const mp_obj_t *args) {
        quirc_destroy(qr);
        mp_raise_ValueError(MP_ERROR_TEXT("failed to decode QR code"));
    }
-    QRDECODE_DEBUG_PRINT("qrdecode: QR code decoded, payload_len=%d\n", data->payload_len);
-    QRDECODE_DEBUG_PRINT("qrdecode: Stack high-water mark: %u bytes\n", uxTaskGetStackHighWaterMark(NULL));
-    //QRDECODE_DEBUG_PRINT("qrdecode: got result: %s\n", data->payload);

-    // Convert decoded data to Python string
-    QRDECODE_DEBUG_PRINT("qrdecode: Creating Python string\n");
    mp_obj_t result = mp_obj_new_bytes((const uint8_t *)data->payload, data->payload_len);
-    QRDECODE_DEBUG_PRINT("qrdecode: Python string created\n");

-    // Clean up
-    QRDECODE_DEBUG_PRINT("qrdecode: Cleaning up\n");
    free(data);
    free(code);
    quirc_destroy(qr);
-    QRDECODE_DEBUG_PRINT("qrdecode: quirc destroyed, returning result\n");
    return result;
 }

-// Wrapper function to fix incompatible pointer type warning
+static mp_obj_t qrdecode_rgb565(mp_uint_t n_args, const mp_obj_t *args) {
+    QRDECODE_DEBUG_PRINT("qrdecode_rgb565: Starting\n");
+
+    if (n_args != 3) {
+        mp_raise_ValueError(MP_ERROR_TEXT("qrdecode_rgb565 expects 3 arguments: buffer, width, height"));
+    }
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
+
+    mp_int_t width = mp_obj_get_int(args[1]);
+    mp_int_t height = mp_obj_get_int(args[2]);
+    QRDECODE_DEBUG_PRINT("qrdecode_rgb565: Width=%u, Height=%u\n", width, height);
+
+    if (width <= 0 || height <= 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("width and height must be positive"));
+    }
+    if (bufinfo.len != (size_t)(width * height * 2)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("buffer size must match width * height * 2 for RGB565"));
+    }
+
+    uint8_t *gray_buffer = (uint8_t *)malloc(width * height * sizeof(uint8_t));
+    if (!gray_buffer) {
+        mp_raise_OSError(MP_ENOMEM);
+    }
+
+    uint16_t *rgb565 = (uint16_t *)bufinfo.buf;
+    for (size_t i = 0; i < (size_t)(width * height); i++) {
+        uint16_t pixel = rgb565[i];
+        uint8_t r = ((pixel >> 11) & 0x1F) << 3;
+        uint8_t g = ((pixel >> 5) & 0x3F) << 2;
+        uint8_t b = (pixel & 0x1F) << 3;
+        gray_buffer[i] = (uint8_t)((0.299 * r + 0.587 * g + 0.114 * b) + 0.5);
+    }
+
+    mp_obj_t gray_args[3] = {
+        mp_obj_new_bytes(gray_buffer, width * height),
+        mp_obj_new_int(width),
+        mp_obj_new_int(height)
+    };
+
+    mp_obj_t result = qrdecode(3, gray_args);
+    free(gray_buffer);
+    return result;
+}
+
 static mp_obj_t qrdecode_wrapper(size_t n_args, const mp_obj_t *args) {
    return qrdecode(n_args, args);
 }

-// Define the MicroPython function
+static mp_obj_t qrdecode_rgb565_wrapper(size_t n_args, const mp_obj_t *args) {
+    return qrdecode_rgb565(n_args, args);
+}
+
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(qrdecode_obj, 3, 3, qrdecode_wrapper);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(qrdecode_rgb565_obj, 3, 3, qrdecode_rgb565_wrapper);

-// Module definition
 static const mp_rom_map_elem_t qrdecode_module_globals_table[] = {
    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_qrdecode) },
    { MP_ROM_QSTR(MP_QSTR_qrdecode), MP_ROM_PTR(&qrdecode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_qrdecode_rgb565), MP_ROM_PTR(&qrdecode_rgb565_obj) },
 };

 static MP_DEFINE_CONST_DICT(qrdecode_module_globals, qrdecode_module_globals_table);
@@ -160,5 +162,4 @@ const mp_obj_module_t qrdecode_module = {
    .globals = (mp_obj_dict_t *)&qrdecode_module_globals,
 };

-// Register the module
 MP_REGISTER_MODULE(MP_QSTR_qrdecode, qrdecode_module);