chore: cleanup

Seeed-Studio · Dec 7, 2024 · 3de7983 · 3de7983
1 parent 682ea48
commit 3de7983
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/porting/himax/we2/boards/grove_vision_ai_v2/board.h b/porting/himax/we2/boards/grove_vision_ai_v2/board.h
@@ -29,7 +29,7 @@
 #define PRODUCT_NAME_PREFIX "grove_vision_ai"
 #define PRODUCT_NAME_SUFFIX "v2"
 #define DEVICE_NAME         (PRODUCT_NAME_PREFIX "_" PRODUCT_NAME_SUFFIX)
-#define PORT_DEVICE_NAME    "Grove Vision AI (V2)"
+#define PORT_DEVICE_NAME    "Grove Vision AI V2"
 #define WATCH_DOG_TIMEOUT_TH 2000
 
 #ifdef __cplusplus

diff --git a/porting/himax/we2/drivers/drv_shared_cfg.h b/porting/himax/we2/drivers/drv_shared_cfg.h
@@ -91,14 +91,18 @@ static_assert(YUV422_BASE_SIZE <= SRAM_1_TAIL_SIZE, "SRAM1 is not enough");
     #define WIRE_TRANSPORT_RX_BASE_SIZE (8 * 1024)
 #endif
 
-#define SRAM_2_START_ADDR_FREE (WIRE_TRANSPORT_TX_BASE_ADDR + WIRE_TRANSPORT_TX_BASE_SIZE)
-#define SRAM_2_SIZE_FREE       (SRAM_2_SIZE - (SRAM_2_START_ADDR_FREE - SRAM_2_START_ADDR))
-
 #if defined(CONFIG_EL_BOARD_SENSECAP_A1102)
-    #define MA_CONTENT_EXPORT_CACHE_ADDR (uint8_t*)(SRAM_2_START_ADDR_FREE)
-    #define MA_CONTENT_EXPORT_CACHE_SIZE (SRAM_2_SIZE_FREE)
+    #define MA_CONTENT_EXPORT_CACHE_SIZE (60 * 1024)
+    #define SRAM_2_START_ADDR_FREE \
+        (WIRE_TRANSPORT_TX_BASE_ADDR + WIRE_TRANSPORT_TX_BASE_SIZE + MA_CONTENT_EXPORT_CACHE_SIZE)
+    #define SRAM_2_SIZE_FREE             (SRAM_2_SIZE - (SRAM_2_START_ADDR_FREE - SRAM_2_START_ADDR))
+    #define MA_CONTENT_EXPORT_CACHE_ADDR \
+        (uint8_t*)(WIRE_TRANSPORT_TX_BASE_ADDR + WIRE_TRANSPORT_TX_BASE_SIZE)
+#else
+    #define SRAM_2_START_ADDR_FREE (WIRE_TRANSPORT_TX_BASE_ADDR + WIRE_TRANSPORT_TX_BASE_SIZE)
+    #define SRAM_2_SIZE_FREE       (SRAM_2_SIZE - (SRAM_2_START_ADDR_FREE - SRAM_2_START_ADDR))
 #endif
 
-static_assert(SRAM_2_SIZE_FREE > 0, "SRAM2 is not enough");
+static_assert(SRAM_2_SIZE_FREE >= 0, "SRAM2 is not enough");
 
 #endif
diff --git a/sscma/utility.hpp b/sscma/utility.hpp
@@ -274,9 +274,9 @@ decltype(auto) img_2_json_str(const el_img_t* img) {
 
 #if SSCMA_SHARED_BASE64_BUFFER
     static char*       buffer      = reinterpret_cast<char*>(SSCMA_SHARED_BASE64_BUFFER_BASE);
-    static std::size_t buffer_size = SSCMA_SHARED_BASE64_BUFFER_SIZE;
+    std::size_t        buffer_size = (((img->size + 2u) / 3u) << 2u) + 1u; 
 
-    if ((((img->size + 2u) / 3u) << 2u) + 1u > buffer_size) {
+    if (buffer_size > SSCMA_SHARED_BASE64_BUFFER_SIZE) {
         EL_LOGW("Error: shared base64 buffer exhausted");
         return std::string{"\"image\": \"\""};
     }
@@ -293,15 +293,17 @@ decltype(auto) img_2_json_str(const el_img_t* img) {
         if (buffer) [[likely]]
             delete[] buffer;
         buffer = new char[buffer_size]{};
+        if (!buffer)
+            return std::string{"\"image\": \"\""};
     }
 #endif
 
-    std::memset(buffer, 0, buffer_size);
     el_base64_encode(img->data, img->size, buffer);
+    buffer[buffer_size] = '\0';
 
     int rotate = (360 - (static_cast<int>(img->rotate) * 90)) % 360;
     _internal_jpeg_buffer = buffer;
-    _internal_jpeg_buffer_size = buffer_size > 1 ? buffer_size - 1 : 0;
+    _internal_jpeg_buffer_size = buffer_size;
     return concat_strings("\"image\": \"", "\"", ", \"rotate\": ", std::to_string(rotate));
 }