{"id":1885,"url":"https://patchwork.libcamera.org/api/1.1/patches/1885/?format=json","web_url":"https://patchwork.libcamera.org/patch/1885/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20190829165311.29196-4-jacopo@jmondi.org>","date":"2019-08-29T16:53:10","name":"[libcamera-devel,v2,3/4] android: camera_device: Report available keys","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"56aba93ace6b6620cc90c737c9bcd6809224a7ba","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1885/mbox/","series":[{"id":474,"url":"https://patchwork.libcamera.org/api/1.1/series/474/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=474","date":"2019-08-29T16:53:07","name":"android: Rework metadata tags","version":2,"mbox":"https://patchwork.libcamera.org/series/474/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1885/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1885/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 080E360E2A\n\tfor ;\n\tThu, 29 Aug 2019 18:51:51 +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 relay12.mail.gandi.net (Postfix) with ESMTPSA id EBD9520000F;\n\tThu, 29 Aug 2019 16:51:49 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi , kamesan@google.com, jcliang@google.com,\n\tshik@google.com, wtlee@google.com","Date":"Thu, 29 Aug 2019 18:53:10 +0200","Message-Id":"<20190829165311.29196-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190829165311.29196-1-jacopo@jmondi.org>","References":"<20190829165311.29196-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/4] android: camera_device: Report\n\tavailable keys","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, 29 Aug 2019 16:51:51 -0000"},"content":"Report the list of available static metadata tags (characteristicKeys),\nof supported controls (requestKeys) and produced metadata (resultKeys)\nin the static metadata pack.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 101 +++++++++++++++++++++++++++++++++-\n 1 file changed, 99 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex bc8ffed92c61..0163e8c4e39a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -130,9 +130,9 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 46 entries, 390 bytes\n+\t * Currently: 49 entries, 674 bytes\n \t */\n-\tstaticMetadata_ = allocate_camera_metadata(50, 500);\n+\tstaticMetadata_ = allocate_camera_metadata(50, 700);\n \n \t/* Color correction static metadata. */\n \tstd::vector aberrationModes = {\n@@ -505,6 +505,103 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tavailableCapabilities.size());\n \tMETADATA_ASSERT(ret);\n \n+\tstd::vector availableCharacteristicsKeys = {\n+\t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n+\t\tANDROID_CONTROL_AE_COMPENSATION_RANGE,\n+\t\tANDROID_CONTROL_AE_COMPENSATION_STEP,\n+\t\tANDROID_CONTROL_AF_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\n+\t\tANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n+\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_MAX_REGIONS,\n+\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n+\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_AVAILABLE_MODES,\n+\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n+\t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n+\t\tANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n+\t\tANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n+\t\tANDROID_SENSOR_ORIENTATION,\n+\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n+\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n+\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n+\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n+\t\tANDROID_SYNC_MAX_LATENCY,\n+\t\tANDROID_FLASH_INFO_AVAILABLE,\n+\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n+\t\tANDROID_LENS_FACING,\n+\t\tANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n+\t\tANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n+\t\tANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n+\t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n+\t\tANDROID_SCALER_AVAILABLE_FORMATS,\n+\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n+\t\tANDROID_SCALER_CROPPING_TYPE,\n+\t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n+\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n+\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n+\t\t\tavailableCharacteristicsKeys.data(),\n+\t\t\tavailableCharacteristicsKeys.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector availableRequestKeys = {\n+\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n+\t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n+\t\tANDROID_CONTROL_AE_MODE,\n+\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n+\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AF_TRIGGER,\n+\t\tANDROID_CONTROL_AWB_MODE,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_FLASH_MODE,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n+\t\t\tavailableRequestKeys.data(),\n+\t\t\tavailableRequestKeys.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector availableResultKeys = {\n+\t\tANDROID_CONTROL_AE_STATE,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AF_STATE,\n+\t\tANDROID_CONTROL_AWB_STATE,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_LENS_STATE,\n+\t\tANDROID_SCALER_CROP_REGION,\n+\t\tANDROID_SENSOR_TIMESTAMP,\n+\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n+\t\tANDROID_SENSOR_EXPOSURE_TIME,\n+\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n+\t\tANDROID_STATISTICS_SCENE_FLICKER,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n+\t\t\tavailableResultKeys.data(),\n+\t\t\tavailableResultKeys.size());\n+\tMETADATA_ASSERT(ret);\n+\n \treturn staticMetadata_;\n }\n \n","prefixes":["libcamera-devel","v2","3/4"]}