Optimize CcapDeviceInfo structure with fixed-size arrays

Co-authored-by: wysaid <1430725+wysaid@users.noreply.github.com>

Author: Copilot

examples/desktop/0-print_camera_c.c

@@ -75,8 +75,6 @@ int main() {
                    deviceInfo.supportedResolutions[0].width,
                    deviceInfo.supportedResolutions[0].height);
         }
-
-        ccap_provider_free_device_info(&deviceInfo);
     }
 
     // Set camera properties

include/ccap_c.h

@@ -61,6 +61,17 @@ typedef enum {
     CCAP_PROPERTY_FRAME_ORIENTATION = 0x40000
 } CcapPropertyName;
 
+/* ========== Constants ========== */
+
+/** @brief Maximum length for device name including null terminator */
+#define CCAP_MAX_DEVICE_NAME_LENGTH 128
+
+/** @brief Maximum number of supported pixel formats */
+#define CCAP_MAX_PIXEL_FORMATS 32
+
+/** @brief Maximum number of supported resolutions */
+#define CCAP_MAX_RESOLUTIONS 64
+
 /* ========== Data Structures ========== */
 
 /** @brief Video frame data structure for C interface */
@@ -85,11 +96,11 @@ typedef struct {
 
 /** @brief Device information structure */
 typedef struct {
-    char* deviceName;                      /**< Device name (caller must free) */
-    CcapPixelFormat* supportedPixelFormats; /**< Array of supported pixel formats (caller must free) */
-    size_t pixelFormatCount;               /**< Number of supported pixel formats */
-    CcapResolution* supportedResolutions;   /**< Array of supported resolutions (caller must free) */
-    size_t resolutionCount;                /**< Number of supported resolutions */
+    char deviceName[CCAP_MAX_DEVICE_NAME_LENGTH];      /**< Device name */
+    CcapPixelFormat supportedPixelFormats[CCAP_MAX_PIXEL_FORMATS]; /**< Array of supported pixel formats */
+    size_t pixelFormatCount;                           /**< Number of supported pixel formats */
+    CcapResolution supportedResolutions[CCAP_MAX_RESOLUTIONS];   /**< Array of supported resolutions */
+    size_t resolutionCount;                            /**< Number of supported resolutions */
 } CcapDeviceInfo;
 
 /** @brief Callback function type for new frame notifications */
@@ -173,17 +184,11 @@ bool ccap_provider_is_opened(const CcapProvider* provider);
 /**
  * @brief Get device information
  * @param provider Pointer to CcapProvider instance
- * @param deviceInfo Output parameter for device information (caller must free using ccap_provider_free_device_info)
+ * @param deviceInfo Output parameter for device information
  * @return true on success, false on failure
  */
 bool ccap_provider_get_device_info(const CcapProvider* provider, CcapDeviceInfo* deviceInfo);
 
-/**
- * @brief Free device info structure
- * @param deviceInfo Pointer to device info structure
- */
-void ccap_provider_free_device_info(CcapDeviceInfo* deviceInfo);
-
 /**
  * @brief Close camera device
  * @param provider Pointer to CcapProvider instance

src/ccap_c.cpp

@@ -190,46 +190,36 @@ bool ccap_provider_get_device_info(const CcapProvider* provider, CcapDeviceInfo*
     // Initialize structure
     memset(deviceInfo, 0, sizeof(CcapDeviceInfo));
 
-    // Copy device name
-    deviceInfo->deviceName = allocate_c_string(info.deviceName);
+    // Copy device name (with bounds checking)
+    size_t deviceNameLen = info.deviceName.size();
+    if (deviceNameLen >= CCAP_MAX_DEVICE_NAME_LENGTH) {
+        deviceNameLen = CCAP_MAX_DEVICE_NAME_LENGTH - 1;
+    }
+    strncpy(deviceInfo->deviceName, info.deviceName.c_str(), deviceNameLen);
+    deviceInfo->deviceName[deviceNameLen] = '\0';
 
-    // Copy supported pixel formats
+    // Copy supported pixel formats (with bounds checking)
     deviceInfo->pixelFormatCount = info.supportedPixelFormats.size();
-    if (deviceInfo->pixelFormatCount > 0) {
-        deviceInfo->supportedPixelFormats = static_cast<CcapPixelFormat*>(
-            malloc(deviceInfo->pixelFormatCount * sizeof(CcapPixelFormat)));
+    if (deviceInfo->pixelFormatCount > CCAP_MAX_PIXEL_FORMATS) {
+        deviceInfo->pixelFormatCount = CCAP_MAX_PIXEL_FORMATS;
+    }
 
-        if (deviceInfo->supportedPixelFormats) {
-            for (size_t i = 0; i < deviceInfo->pixelFormatCount; ++i) {
-                deviceInfo->supportedPixelFormats[i] = convert_pixel_format_to_c(info.supportedPixelFormats[i]);
-            }
-        }
+    for (size_t i = 0; i < deviceInfo->pixelFormatCount; ++i) {
+        deviceInfo->supportedPixelFormats[i] = convert_pixel_format_to_c(info.supportedPixelFormats[i]);
     }
 
-    // Copy supported resolutions
+    // Copy supported resolutions (with bounds checking)
     deviceInfo->resolutionCount = info.supportedResolutions.size();
-    if (deviceInfo->resolutionCount > 0) {
-        deviceInfo->supportedResolutions = static_cast<CcapResolution*>(
-            malloc(deviceInfo->resolutionCount * sizeof(CcapResolution)));
-
-        if (deviceInfo->supportedResolutions) {
-            for (size_t i = 0; i < deviceInfo->resolutionCount; ++i) {
-                deviceInfo->supportedResolutions[i].width = info.supportedResolutions[i].width;
-                deviceInfo->supportedResolutions[i].height = info.supportedResolutions[i].height;
-            }
-        }
+    if (deviceInfo->resolutionCount > CCAP_MAX_RESOLUTIONS) {
+        deviceInfo->resolutionCount = CCAP_MAX_RESOLUTIONS;
     }
 
-    return true;
-}
-
-void ccap_provider_free_device_info(CcapDeviceInfo* deviceInfo) {
-    if (deviceInfo) {
-        free(deviceInfo->deviceName);
-        free(deviceInfo->supportedPixelFormats);
-        free(deviceInfo->supportedResolutions);
-        memset(deviceInfo, 0, sizeof(CcapDeviceInfo));
+    for (size_t i = 0; i < deviceInfo->resolutionCount; ++i) {
+        deviceInfo->supportedResolutions[i].width = info.supportedResolutions[i].width;
+        deviceInfo->supportedResolutions[i].height = info.supportedResolutions[i].height;
     }
+
+    return true;
 }
 
 void ccap_provider_close(CcapProvider* provider) {