{"id":1944,"url":"https://patchwork.libcamera.org/api/patches/1944/?format=json","web_url":"https://patchwork.libcamera.org/patch/1944/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190905210940.32358-3-jacopo@jmondi.org>","date":"2019-09-05T21:09:33","name":"[libcamera-devel,v7,2/9] android: camera_device: Use correct sizes for static metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"21e53bc8ea55b81657992557bf71a043408e3c12","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1944/mbox/","series":[{"id":482,"url":"https://patchwork.libcamera.org/api/series/482/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=482","date":"2019-09-05T21:09:31","name":"android: Rework metadata tags","version":7,"mbox":"https://patchwork.libcamera.org/series/482/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1944/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1944/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F0FF461567\n\tfor ;\n\tThu, 5 Sep 2019 23:08:14 +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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 731FEC0005;\n\tThu, 5 Sep 2019 21:08:14 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Sep 2019 23:09:33 +0200","Message-Id":"<20190905210940.32358-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190905210940.32358-1-jacopo@jmondi.org>","References":"<20190905210940.32358-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 2/9] android: camera_device: Use\n\tcorrect sizes for static metadata","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 05 Sep 2019 21:08:15 -0000"},"content":"Use more opportune sizes for the static metadata pack, and for the\ndynamic metadata sizes which where wrongly set to use the ones defined\nfor the static pack.\n\nAcked-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 15f57a7fe731..dee60e3d2931 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -128,11 +128,11 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t * more.\n \t */\n \n-\t/* \\todo Use correct sizes */\n-\t#define STATIC_ENTRY_CAP 256\n-\t#define STATIC_DATA_CAP 6688\n-\tstaticMetadata_ = allocate_camera_metadata(STATIC_ENTRY_CAP,\n-\t\t\t\t\t\t STATIC_DATA_CAP);\n+\t/*\n+\t * \\todo Keep this in sync with the actual number of entries.\n+\t * Currently: 46 entries, 390 bytes\n+\t */\n+\tstaticMetadata_ = allocate_camera_metadata(50, 500);\n \n \t/* Color correction static metadata. */\n \tstd::vector aberrationModes = {\n@@ -966,11 +966,11 @@ camera_metadata_t *CameraDevice::getResultMetadata(int frame_number,\n {\n \tint ret;\n \n-\t/* \\todo Use correct sizes */\n-\t#define RESULT_ENTRY_CAP 256\n-\t#define RESULT_DATA_CAP 6688\n-\tcamera_metadata_t *resultMetadata =\n-\t\tallocate_camera_metadata(STATIC_ENTRY_CAP, STATIC_DATA_CAP);\n+\t/*\n+\t * \\todo Keep this in sync with the actual number of entries.\n+\t * Currently: 13 entries, 36 bytes\n+\t */\n+\tcamera_metadata_t *resultMetadata = allocate_camera_metadata(15, 50);\n \n \tconst uint8_t ae_state = ANDROID_CONTROL_AE_STATE_CONVERGED;\n \tret = add_camera_metadata_entry(resultMetadata, ANDROID_CONTROL_AE_STATE,\n","prefixes":["libcamera-devel","v7","2/9"]}