Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1930,
    "url": "https://patchwork.libcamera.org/api/patches/1930/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/1930/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20190904141825.20697-8-jacopo@jmondi.org>",
    "date": "2019-09-04T14:18:24",
    "name": "[libcamera-devel,v5,7/8] android: camera_device: Free metadata in error path",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "302ad714133f16c9e2382fc2daae6e3d254f22e3",
    "submitter": {
        "id": 3,
        "url": "https://patchwork.libcamera.org/api/people/3/?format=api",
        "name": "Jacopo Mondi",
        "email": "jacopo@jmondi.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/1930/mbox/",
    "series": [
        {
            "id": 480,
            "url": "https://patchwork.libcamera.org/api/series/480/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=480",
            "date": "2019-09-04T14:18:17",
            "name": "android: Rework metadata tags",
            "version": 5,
            "mbox": "https://patchwork.libcamera.org/series/480/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/1930/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/1930/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<jacopo@jmondi.org>",
        "Received": [
            "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A70660BB2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  4 Sep 2019 16:17:11 +0200 (CEST)",
            "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 151DD1C001C;\n\tWed,  4 Sep 2019 14:17:09 +0000 (UTC)"
        ],
        "X-Originating-IP": "2.224.242.101",
        "From": "Jacopo Mondi <jacopo@jmondi.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Cc": "Jacopo Mondi <jacopo@jmondi.org>, kamesan@google.com, jcliang@google.com,\n\tshik@google.com, wtlee@google.com",
        "Date": "Wed,  4 Sep 2019 16:18:24 +0200",
        "Message-Id": "<20190904141825.20697-8-jacopo@jmondi.org>",
        "X-Mailer": "git-send-email 2.23.0",
        "In-Reply-To": "<20190904141825.20697-1-jacopo@jmondi.org>",
        "References": "<20190904141825.20697-1-jacopo@jmondi.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH v5 7/8] android: camera_device: Free\n\tmetadata in error path",
        "X-BeenThere": "libcamera-devel@lists.libcamera.org",
        "X-Mailman-Version": "2.1.23",
        "Precedence": "list",
        "List-Id": "<libcamera-devel.lists.libcamera.org>",
        "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>",
        "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>",
        "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>",
        "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>",
        "X-List-Received-Date": "Wed, 04 Sep 2019 14:17:11 -0000"
    },
    "content": "The current assertion macro on camera metadata handling operations\ndoes not free the allocated metadata pack in case of errors.\n\nFix this by freeing the metadata pack in the error path.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 140 +++++++++++++++++-----------------\n src/android/camera_device.h   |   3 +-\n 2 files changed, 72 insertions(+), 71 deletions(-)",
    "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c4f11e91bcf1..a153972fbef0 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -141,7 +141,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n \t\t\taberrationModes.data(), aberrationModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Control static metadata. */\n \tstd::vector<uint8_t> aeAvailableAntiBandingModes = {\n@@ -154,7 +154,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n \t\t\taeAvailableAntiBandingModes.data(),\n \t\t\taeAvailableAntiBandingModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> aeAvailableModes = {\n \t\tANDROID_CONTROL_AE_MODE_ON,\n@@ -162,7 +162,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n \t\t\taeAvailableModes.data(), aeAvailableModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int32_t> availableAeFpsTarget = {\n \t\t15, 30,\n@@ -171,7 +171,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n \t\t\tavailableAeFpsTarget.data(),\n \t\t\tavailableAeFpsTarget.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int32_t> aeCompensationRange = {\n \t\t0, 0,\n@@ -180,7 +180,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_CONTROL_AE_COMPENSATION_RANGE,\n \t\t\taeCompensationRange.data(),\n \t\t\taeCompensationRange.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tconst camera_metadata_rational_t aeCompensationStep[] = {\n \t\t{ 0, 1 }\n@@ -188,7 +188,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AE_COMPENSATION_STEP,\n \t\t\taeCompensationStep, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableAfModes = {\n \t\tANDROID_CONTROL_AF_MODE_OFF,\n@@ -196,7 +196,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AF_AVAILABLE_MODES,\n \t\t\tavailableAfModes.data(), availableAfModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableEffects = {\n \t\tANDROID_CONTROL_EFFECT_MODE_OFF,\n@@ -204,7 +204,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\n \t\t\tavailableEffects.data(), availableEffects.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableSceneModes = {\n \t\tANDROID_CONTROL_SCENE_MODE_DISABLED,\n@@ -212,7 +212,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n \t\t\tavailableSceneModes.data(), availableSceneModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableStabilizationModes = {\n \t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF,\n@@ -221,7 +221,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n \t\t\tavailableStabilizationModes.data(),\n \t\t\tavailableStabilizationModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableAwbModes = {\n \t\tANDROID_CONTROL_AWB_MODE_OFF,\n@@ -229,7 +229,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n \t\t\tavailableAwbModes.data(), availableAwbModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int32_t> availableMaxRegions = {\n \t\t0, 0, 0,\n@@ -237,7 +237,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_MAX_REGIONS,\n \t\t\tavailableMaxRegions.data(), availableMaxRegions.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> sceneModesOverride = {\n \t\tANDROID_CONTROL_AE_MODE_ON,\n@@ -247,25 +247,25 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n \t\t\tsceneModesOverride.data(), sceneModesOverride.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n \t\t\t&aeLockAvailable, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n \t\t\t&awbLockAvailable, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tchar availableControlModes = ANDROID_CONTROL_MODE_AUTO;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_CONTROL_AVAILABLE_MODES,\n \t\t\t&availableControlModes, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* JPEG static metadata. */\n \tstd::vector<int32_t> availableThumbnailSizes = {\n@@ -275,7 +275,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n \t\t\tavailableThumbnailSizes.data(),\n \t\t\tavailableThumbnailSizes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Sensor static metadata. */\n \tint32_t pixelArraySize[] = {\n@@ -284,7 +284,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n \t\t\t\t&pixelArraySize, 2);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tint32_t sensorSizes[] = {\n \t\t0, 0, 2560, 1920,\n@@ -292,7 +292,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n \t\t\t\t&sensorSizes, 4);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tint32_t sensitivityRange[] = {\n \t\t32, 2400,\n@@ -300,13 +300,13 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n \t\t\t\t&sensitivityRange, 2);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint16_t filterArr = ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GRBG;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n \t\t\t\t&filterArr, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tint64_t exposureTimeRange[] = {\n \t\t100000, 200000000,\n@@ -314,13 +314,13 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n \t\t\t\t&exposureTimeRange, 2);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tint32_t orientation = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_ORIENTATION,\n \t\t\t\t&orientation, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int32_t> testPatterModes = {\n \t\tANDROID_SENSOR_TEST_PATTERN_MODE_OFF,\n@@ -328,7 +328,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n \t\t\t\ttestPatterModes.data(), testPatterModes.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<float> physicalSize = {\n \t\t2592, 1944,\n@@ -336,39 +336,39 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n \t\t\t\tphysicalSize.data(), physicalSize.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n \t\t\t&timestampSource, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Statistics static metadata. */\n \tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n \t\t\t&faceDetectMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tint32_t maxFaceCount = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n \t\t\t&maxFaceCount, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Sync static metadata. */\n \tint32_t maxLatency = ANDROID_SYNC_MAX_LATENCY_UNKNOWN;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_SYNC_MAX_LATENCY, &maxLatency, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Flash static metadata. */\n \tchar flashAvailable = ANDROID_FLASH_INFO_AVAILABLE_FALSE;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_FLASH_INFO_AVAILABLE,\n \t\t\t&flashAvailable, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Lens static metadata. */\n \tstd::vector<float> lensApertures = {\n@@ -377,12 +377,12 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n \t\t\t\tlensApertures.data(), lensApertures.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t lensFacing = ANDROID_LENS_FACING_FRONT;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_LENS_FACING, &lensFacing, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<float> lensFocalLenghts = {\n \t\t1,\n@@ -391,7 +391,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\tANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n \t\t\t\tlensFocalLenghts.data(),\n \t\t\t\tlensFocalLenghts.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> opticalStabilizations = {\n \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF,\n@@ -400,33 +400,33 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\tANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n \t\t\t\topticalStabilizations.data(),\n \t\t\t\topticalStabilizations.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tfloat hypeFocalDistance = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n \t\t\t\t&hypeFocalDistance, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tfloat minFocusDistance = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n \t\t\t\t&minFocusDistance, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Noise reduction modes. */\n \tuint8_t noiseReductionModes = ANDROID_NOISE_REDUCTION_MODE_OFF;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n \t\t\t\t&noiseReductionModes, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Scaler static metadata. */\n \tfloat maxDigitalZoom = 1;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n \t\t\t&maxDigitalZoom, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint32_t> availableStreamFormats = {\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB,\n@@ -437,7 +437,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_SCALER_AVAILABLE_FORMATS,\n \t\t\tavailableStreamFormats.data(),\n \t\t\tavailableStreamFormats.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint32_t> availableStreamConfigurations = {\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920,\n@@ -451,7 +451,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n \t\t\tavailableStreamConfigurations.data(),\n \t\t\tavailableStreamConfigurations.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int64_t> availableStallDurations = {\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,\n@@ -460,7 +460,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n \t\t\tavailableStallDurations.data(),\n \t\t\tavailableStallDurations.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<int64_t> minFrameDurations = {\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,\n@@ -470,12 +470,12 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n \t\t\tminFrameDurations.data(), minFrameDurations.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_SCALER_CROPPING_TYPE, &croppingType, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \t/* Info static metadata. */\n \tuint8_t supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n@@ -488,13 +488,13 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n \t\t\t&partialResultCount, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tuint8_t maxPipelineDepth = 2;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n \t\t\t&maxPipelineDepth, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \tstd::vector<uint8_t> availableCapabilities = {\n \t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,\n@@ -503,7 +503,7 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n \t\t\tavailableCapabilities.data(),\n \t\t\tavailableCapabilities.size());\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, staticMetadata_);\n \n \treturn staticMetadata_;\n }\n@@ -532,66 +532,66 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AE_MODE,\n \t\t\t&aeMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tint32_t aeExposureCompensation = 0;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n \t\t\t&aeExposureCompensation, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t aePrecaptureTrigger = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n \t\t\t&aePrecaptureTrigger, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AE_LOCK,\n \t\t\t&aeLock, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AF_TRIGGER,\n \t\t\t&afTrigger, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t awbMode = ANDROID_CONTROL_AWB_MODE_AUTO;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AWB_MODE,\n \t\t\t&awbMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_AWB_LOCK,\n \t\t\t&awbLock, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_FLASH_MODE,\n \t\t\t&flashMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\t\t&faceDetectMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \tuint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n \t\t\t&aberrationMode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \t/* Use the capture intent matching the requested template type. */\n \tuint8_t captureIntent;\n@@ -621,7 +621,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \tret = add_camera_metadata_entry(requestTemplate,\n \t\t\tANDROID_CONTROL_CAPTURE_INTENT,\n \t\t\t&captureIntent, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, requestTemplate);\n \n \trequestTemplates_[type] = requestTemplate;\n \n@@ -887,35 +887,35 @@ camera_metadata_t *CameraDevice::getResultMetadata(int frame_number,\n \tconst uint8_t ae_state = ANDROID_CONTROL_AE_STATE_CONVERGED;\n \tret = add_camera_metadata_entry(resultMetadata, ANDROID_CONTROL_AE_STATE,\n \t\t\t\t\t&ae_state, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t ae_lock = ANDROID_CONTROL_AE_LOCK_OFF;\n \tret = add_camera_metadata_entry(resultMetadata, ANDROID_CONTROL_AE_LOCK,\n \t\t\t\t\t&ae_lock, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tuint8_t af_state = ANDROID_CONTROL_AF_STATE_INACTIVE;\n \tret = add_camera_metadata_entry(resultMetadata, ANDROID_CONTROL_AF_STATE,\n \t\t\t\t\t&af_state, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t awb_state = ANDROID_CONTROL_AWB_STATE_CONVERGED;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_CONTROL_AWB_STATE,\n \t\t\t\t\t&awb_state, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t awb_lock = ANDROID_CONTROL_AWB_LOCK_OFF;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_CONTROL_AWB_LOCK,\n \t\t\t\t\t&awb_lock, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t lens_state = ANDROID_LENS_STATE_STATIONARY;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_LENS_STATE,\n \t\t\t\t\t&lens_state, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tint32_t sensorSizes[] = {\n \t\t0, 0, 2560, 1920,\n@@ -923,39 +923,39 @@ camera_metadata_t *CameraDevice::getResultMetadata(int frame_number,\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_SCALER_CROP_REGION,\n \t\t\t\t\tsensorSizes, 4);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_SENSOR_TIMESTAMP,\n \t\t\t\t\t&timestamp, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \t/* 33.3 msec */\n \tconst int64_t rolling_shutter_skew = 33300000;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n \t\t\t\t\t&rolling_shutter_skew, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \t/* 16.6 msec */\n \tconst int64_t exposure_time = 16600000;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_SENSOR_EXPOSURE_TIME,\n \t\t\t\t\t&exposure_time, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t lens_shading_map_mode =\n \t\t\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n \t\t\t\t\t&lens_shading_map_mode, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \tconst uint8_t scene_flicker = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n \tret = add_camera_metadata_entry(resultMetadata,\n \t\t\t\t\tANDROID_STATISTICS_SCENE_FLICKER,\n \t\t\t\t\t&scene_flicker, 1);\n-\tMETADATA_ASSERT(ret);\n+\tMETADATA_ASSERT(ret, resultMetadata);\n \n \treturn resultMetadata;\n }\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 64382bbac76a..9880168a7581 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -19,10 +19,11 @@\n \n #include \"message.h\"\n \n-#define METADATA_ASSERT(_r)\t\t\\\n+#define METADATA_ASSERT(_r, _p)\t\t\\\n \tdo {\t\t\t\t\\\n \t\tif (!(_r)) break;\t\\\n \t\tLOG(HAL, Error) << \"Error: \" << __func__ << \":\" << __LINE__; \\\n+\t\tfree_camera_metadata((_p));\t\t\t\t     \\\n \t\treturn nullptr;\t\t\\\n \t} while(0);\n \n",
    "prefixes": [
        "libcamera-devel",
        "v5",
        "7/8"
    ]
}