[{"id":14780,"web_url":"https://patchwork.libcamera.org/comment/14780/","msgid":"<20210126131707.s22o4p5d6dazblpc@uno.localdomain>","date":"2021-01-26T13:17:07","subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Paul,\n\nOn Tue, Jan 26, 2021 at 07:28:22PM +0900, Paul Elder wrote:\n> Set the following android result metadata:\n> - ANDROID_LENS_FOCAL_LENGTH\n> - ANDROID_LENS_APERTURE\n> - ANDROID_JPEG_GPS_TIMESTAMP\n> - ANDROID_JPEG_GPS_COORDINATES\n> - ANDROID_JPEG_GPS_PROCESSING_METHOD\n> - ANDROID_JPEG_SIZE\n> - ANDROID_JPEG_QUALITY\n> - ANDROID_JPEG_ORIENTATION\n>\n> And the following EXIF fields:\n> - GPSDatestamp\n> - GPSTimestamp\n> - GPSLocation\n>   - GPSLatitudeRef\n>   - GPSLatitude\n>   - GPSLongitudeRef\n>   - GPSLongitude\n>   - GPSAltitudeRef\n>   - GPSAltitude\n> - GPSProcessingMethod\n> - FocalLength\n> - ExposureTime\n> - FNumber\n> - ISO\n> - Flash\n> - WhiteBalance\n> - SubsecTime\n> - SubsecTimeOriginal\n> - SubsecTimeDigitized\n>\n> Based on android request metadata.\n>\n> This allows the following CTS tests to pass:\n> - android.hardware.camera2.cts.StillCaptureTest#testFocalLengths\n> - android.hardware.camera2.cts.StillCaptureTest#testJpegExif\n>\n> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nLooks good now, thanks!\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n  j\n\n>\n> ---\n> Changes in v5:\n> - fix jpegQuality type\n> - drop todo about handling null request settings that's fixed in a later\n>   patch\n> - add todo about getting exif information from\n>   libcamera::Request::metadata\n> - fix JPEG metadata size allocation comment, add total\n> - add metadata entries to availableResultKeys and add the necessary\n>   bytes to the static metadata pack size\n>\n> Changes in v4:\n> - remove unused variable\n> - move android JPEG thumbnail tags allocation to the thumbnail patch\n> - move setting the timestamp with subsec to the patch that adds set\n>   subsec to timestamp (\"android: jpeg: exif: Add functions for\n>   setting various values\")\n> - group setting GPS-related tags\n>\n> Changes in v3:\n> - fix metadata entries and byte count\n> - fix gps processing method string truncation\n> - move thumbnail handling to a different patch\n>\n> Changes in v2:\n> - break out processControls and thumbnailer configuration into\n>   different\n>   patches\n> - fix android metadata entry number and size\n> - other small changes\n> ---\n>  src/android/camera_device.cpp            | 26 ++++++++--\n>  src/android/camera_stream.cpp            |  7 ++-\n>  src/android/camera_stream.h              |  4 +-\n>  src/android/jpeg/post_processor_jpeg.cpp | 63 +++++++++++++++++++-----\n>  src/android/jpeg/post_processor_jpeg.h   |  3 +-\n>  src/android/post_processor.h             |  3 +-\n>  6 files changed, 86 insertions(+), 20 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 7929877c..096c2463 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -708,7 +708,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()\n>  \t * Currently: 53 entries, 782 bytes of static metadata\n>  \t */\n>  \tuint32_t numEntries = 53;\n> -\tuint32_t byteSize = 782;\n> +\tuint32_t byteSize = 802;\n>\n>  \t/*\n>  \t * Calculate space occupation in bytes for dynamically built metadata\n> @@ -1253,6 +1253,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n>  \t\tANDROID_FLASH_MODE,\n>  \t\tANDROID_FLASH_STATE,\n> +\t\tANDROID_LENS_APERTURE,\n> +\t\tANDROID_LENS_FOCAL_LENGTH,\n>  \t\tANDROID_LENS_STATE,\n>  \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n>  \t\tANDROID_SENSOR_TIMESTAMP,\n> @@ -1264,6 +1266,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_NOISE_REDUCTION_MODE,\n>  \t\tANDROID_REQUEST_PIPELINE_DEPTH,\n>  \t\tANDROID_SCALER_CROP_REGION,\n> +\t\tANDROID_JPEG_GPS_COORDINATES,\n> +\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\tANDROID_JPEG_GPS_TIMESTAMP,\n>  \t\tANDROID_JPEG_SIZE,\n>  \t\tANDROID_JPEG_QUALITY,\n>  \t\tANDROID_JPEG_ORIENTATION,\n> @@ -1816,6 +1821,7 @@ void CameraDevice::requestComplete(Request *request)\n>  \t\t}\n>\n>  \t\tint ret = cameraStream->process(*buffer, &mapped,\n> +\t\t\t\t\t\tdescriptor->settings_,\n>  \t\t\t\t\t\tresultMetadata.get());\n>  \t\tif (ret) {\n>  \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> @@ -1912,14 +1918,18 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>\n>  \t/*\n>  \t * \\todo Keep this in sync with the actual number of entries.\n> -\t * Currently: 33 entries, 75 bytes\n> +\t * Currently: 38 entries, 147 bytes\n>  \t *\n>  \t * Reserve more space for the JPEG metadata set by the post-processor.\n>  \t * Currently: ANDROID_JPEG_SIZE (int32_t), ANDROID_JPEG_QUALITY (byte),\n> -\t * ANDROID_JPEG_ORIENTATION (int32_t) = 3 entries, 9 bytes.\n> +\t * ANDROID_JPEG_GPS_COORDINATES (double x 3) = 24 bytes\n> +\t * ANDROID_JPEG_GPS_PROCESSING_METHOD (byte x 32) = 32 bytes\n> +\t * ANDROID_JPEG_GPS_TIMESTAMP (int64) = 8 bytes\n> +\t * ANDROID_JPEG_ORIENTATION (int32_t) = 4 bytes\n> +\t * Total bytes for JPEG metadata: 73\n>  \t */\n>  \tstd::unique_ptr<CameraMetadata> resultMetadata =\n> -\t\tstd::make_unique<CameraMetadata>(33, 75);\n> +\t\tstd::make_unique<CameraMetadata>(38, 147);\n>  \tif (!resultMetadata->isValid()) {\n>  \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n>  \t\treturn nullptr;\n> @@ -1984,6 +1994,14 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>  \tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n>  \tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n>\n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\tresultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);\n> +\n> +\tfloat focal_length = 1.0;\n> +\tresultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length, 1);\n> +\n>  \tvalue = ANDROID_LENS_STATE_STATIONARY;\n>  \tresultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n>\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index dba351a4..4c8020e5 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -96,12 +96,15 @@ int CameraStream::configure()\n>  }\n>\n>  int CameraStream::process(const libcamera::FrameBuffer &source,\n> -\t\t\t  MappedCamera3Buffer *dest, CameraMetadata *metadata)\n> +\t\t\t  MappedCamera3Buffer *dest,\n> +\t\t\t  const CameraMetadata &requestMetadata,\n> +\t\t\t  CameraMetadata *resultMetadata)\n>  {\n>  \tif (!postProcessor_)\n>  \t\treturn 0;\n>\n> -\treturn postProcessor_->process(source, dest->maps()[0], metadata);\n> +\treturn postProcessor_->process(source, dest->maps()[0],\n> +\t\t\t\t       requestMetadata, resultMetadata);\n>  }\n>\n>  FrameBuffer *CameraStream::getBuffer()\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index cc9d5470..298ffbf6 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -119,7 +119,9 @@ public:\n>\n>  \tint configure();\n>  \tint process(const libcamera::FrameBuffer &source,\n> -\t\t    MappedCamera3Buffer *dest, CameraMetadata *metadata);\n> +\t\t    MappedCamera3Buffer *dest,\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata);\n>  \tlibcamera::FrameBuffer *getBuffer();\n>  \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n>\n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index aa0f783d..7e49e9d9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -83,17 +83,26 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n>\n>  int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t\t\t       Span<uint8_t> destination,\n> -\t\t\t       CameraMetadata *metadata)\n> +\t\t\t       const CameraMetadata &requestMetadata,\n> +\t\t\t       CameraMetadata *resultMetadata)\n>  {\n>  \tif (!encoder_)\n>  \t\treturn 0;\n>\n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret;\n> +\n>  \t/* Set EXIF metadata for various tags. */\n>  \tExif exif;\n> -\t/* \\todo Set Make and Model from external vendor tags. */\n> -\texif.setMake(\"libcamera\");\n> -\texif.setModel(\"cameraModel\");\n> -\texif.setOrientation(cameraDevice_->orientation());\n> +\texif.setMake(cameraDevice_->maker());\n> +\texif.setModel(cameraDevice_->model());\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry);\n> +\n> +\tconst uint32_t jpegOrientation = ret ? *entry.data.i32 : 0;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpegOrientation, 1);\n> +\texif.setOrientation(jpegOrientation);\n> +\n>  \texif.setSize(streamSize_);\n>  \t/*\n>  \t * We set the frame's EXIF timestamp as the time of encode.\n> @@ -102,6 +111,39 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t */\n>  \texif.setTimestamp(std::time(nullptr), 0ms);\n>\n> +\t/* \\todo Get this information from libcamera::Request::metadata */\n> +\texif.setExposureTime(0);\n> +\tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\texif.setAperture(*entry.data.f);\n> +\texif.setISO(100);\n> +\texif.setFlash(Exif::Flash::FlashNotPresent);\n> +\texif.setWhiteBalance(Exif::WhiteBalance::Auto);\n> +\n> +\texif.setFocalLength(1.0);\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_TIMESTAMP, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSDateTimestamp(*entry.data.i64);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP,\n> +\t\t\t\t\t entry.data.i64, 1);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_COORDINATES, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSLocation(entry.data.d);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_COORDINATES,\n> +\t\t\t\t\t entry.data.d, 3);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD, &entry);\n> +\tif (ret) {\n> +\t\tstd::string method(entry.data.u8, entry.data.u8 + entry.count);\n> +\t\texif.setGPSMethod(method);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\t\t\t\t entry.data.u8, entry.count);\n> +\t}\n> +\n>  \tstd::vector<unsigned char> thumbnail;\n>  \tgenerateThumbnail(source, &thumbnail);\n>  \tif (!thumbnail.empty())\n> @@ -136,13 +178,12 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \tblob->jpeg_size = jpeg_size;\n>\n>  \t/* Update the JPEG result Metadata. */\n> -\tmetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n> -\n> -\tconst uint32_t jpeg_quality = 95;\n> -\tmetadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);\n> +\tresultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n>\n> -\tconst uint32_t jpeg_orientation = 0;\n> -\tmetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpeg_orientation, 1);\n> +\t/* \\todo Configure JPEG encoder with this */\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);\n> +\tconst uint8_t jpegQuality = ret ? *entry.data.u8 : 95;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpegQuality, 1);\n>\n>  \treturn 0;\n>  }\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 5afa831c..d721d1b9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -26,7 +26,8 @@ public:\n>  \t\t      const libcamera::StreamConfiguration &outcfg) override;\n>  \tint process(const libcamera::FrameBuffer &source,\n>  \t\t    libcamera::Span<uint8_t> destination,\n> -\t\t    CameraMetadata *metadata) override;\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata) override;\n>\n>  private:\n>  \tvoid generateThumbnail(const libcamera::FrameBuffer &source,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index e0f91880..bda93bb4 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -22,7 +22,8 @@ public:\n>  \t\t\t      const libcamera::StreamConfiguration &outCfg) = 0;\n>  \tvirtual int process(const libcamera::FrameBuffer &source,\n>  \t\t\t    libcamera::Span<uint8_t> destination,\n> -\t\t\t    CameraMetadata *metadata) = 0;\n> +\t\t\t    const CameraMetadata &requestMetadata,\n> +\t\t\t    CameraMetadata *resultMetadata) = 0;\n>  };\n>\n>  #endif /* __ANDROID_POST_PROCESSOR_H__ */\n> --\n> 2.27.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 464A1BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jan 2021 13:16:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D462B682FF;\n\tTue, 26 Jan 2021 14:16:48 +0100 (CET)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 36F29682EC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jan 2021 14:16:48 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id B049E1BF20D;\n\tTue, 26 Jan 2021 13:16:47 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 26 Jan 2021 14:17:07 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Paul Elder <paul.elder@ideasonboard.com>","Message-ID":"<20210126131707.s22o4p5d6dazblpc@uno.localdomain>","References":"<20210126102825.147026-1-paul.elder@ideasonboard.com>\n\t<20210126102825.147026-6-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210126102825.147026-6-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":14782,"web_url":"https://patchwork.libcamera.org/comment/14782/","msgid":"<YBAXbIQhHp4AHwM0@pendragon.ideasonboard.com>","date":"2021-01-26T13:21:48","subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Tue, Jan 26, 2021 at 07:28:22PM +0900, Paul Elder wrote:\n> Set the following android result metadata:\n> - ANDROID_LENS_FOCAL_LENGTH\n> - ANDROID_LENS_APERTURE\n> - ANDROID_JPEG_GPS_TIMESTAMP\n> - ANDROID_JPEG_GPS_COORDINATES\n> - ANDROID_JPEG_GPS_PROCESSING_METHOD\n> - ANDROID_JPEG_SIZE\n> - ANDROID_JPEG_QUALITY\n> - ANDROID_JPEG_ORIENTATION\n> \n> And the following EXIF fields:\n> - GPSDatestamp\n> - GPSTimestamp\n> - GPSLocation\n>   - GPSLatitudeRef\n>   - GPSLatitude\n>   - GPSLongitudeRef\n>   - GPSLongitude\n>   - GPSAltitudeRef\n>   - GPSAltitude\n> - GPSProcessingMethod\n> - FocalLength\n> - ExposureTime\n> - FNumber\n> - ISO\n> - Flash\n> - WhiteBalance\n> - SubsecTime\n> - SubsecTimeOriginal\n> - SubsecTimeDigitized\n> \n> Based on android request metadata.\n> \n> This allows the following CTS tests to pass:\n> - android.hardware.camera2.cts.StillCaptureTest#testFocalLengths\n> - android.hardware.camera2.cts.StillCaptureTest#testJpegExif\n> \n> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> ---\n> Changes in v5:\n> - fix jpegQuality type\n> - drop todo about handling null request settings that's fixed in a later\n>   patch\n> - add todo about getting exif information from\n>   libcamera::Request::metadata\n> - fix JPEG metadata size allocation comment, add total\n> - add metadata entries to availableResultKeys and add the necessary\n>   bytes to the static metadata pack size\n> \n> Changes in v4:\n> - remove unused variable\n> - move android JPEG thumbnail tags allocation to the thumbnail patch\n> - move setting the timestamp with subsec to the patch that adds set\n>   subsec to timestamp (\"android: jpeg: exif: Add functions for\n>   setting various values\")\n> - group setting GPS-related tags\n> \n> Changes in v3:\n> - fix metadata entries and byte count\n> - fix gps processing method string truncation\n> - move thumbnail handling to a different patch\n> \n> Changes in v2:\n> - break out processControls and thumbnailer configuration into\n>   different\n>   patches\n> - fix android metadata entry number and size\n> - other small changes\n> ---\n>  src/android/camera_device.cpp            | 26 ++++++++--\n>  src/android/camera_stream.cpp            |  7 ++-\n>  src/android/camera_stream.h              |  4 +-\n>  src/android/jpeg/post_processor_jpeg.cpp | 63 +++++++++++++++++++-----\n>  src/android/jpeg/post_processor_jpeg.h   |  3 +-\n>  src/android/post_processor.h             |  3 +-\n>  6 files changed, 86 insertions(+), 20 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 7929877c..096c2463 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -708,7 +708,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()\n>  \t * Currently: 53 entries, 782 bytes of static metadata\n>  \t */\n>  \tuint32_t numEntries = 53;\n> -\tuint32_t byteSize = 782;\n> +\tuint32_t byteSize = 802;\n>  \n>  \t/*\n>  \t * Calculate space occupation in bytes for dynamically built metadata\n> @@ -1253,6 +1253,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n>  \t\tANDROID_FLASH_MODE,\n>  \t\tANDROID_FLASH_STATE,\n> +\t\tANDROID_LENS_APERTURE,\n> +\t\tANDROID_LENS_FOCAL_LENGTH,\n>  \t\tANDROID_LENS_STATE,\n>  \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n>  \t\tANDROID_SENSOR_TIMESTAMP,\n> @@ -1264,6 +1266,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_NOISE_REDUCTION_MODE,\n>  \t\tANDROID_REQUEST_PIPELINE_DEPTH,\n>  \t\tANDROID_SCALER_CROP_REGION,\n> +\t\tANDROID_JPEG_GPS_COORDINATES,\n> +\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\tANDROID_JPEG_GPS_TIMESTAMP,\n>  \t\tANDROID_JPEG_SIZE,\n>  \t\tANDROID_JPEG_QUALITY,\n>  \t\tANDROID_JPEG_ORIENTATION,\n> @@ -1816,6 +1821,7 @@ void CameraDevice::requestComplete(Request *request)\n>  \t\t}\n>  \n>  \t\tint ret = cameraStream->process(*buffer, &mapped,\n> +\t\t\t\t\t\tdescriptor->settings_,\n>  \t\t\t\t\t\tresultMetadata.get());\n>  \t\tif (ret) {\n>  \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> @@ -1912,14 +1918,18 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>  \n>  \t/*\n>  \t * \\todo Keep this in sync with the actual number of entries.\n> -\t * Currently: 33 entries, 75 bytes\n> +\t * Currently: 38 entries, 147 bytes\n>  \t *\n>  \t * Reserve more space for the JPEG metadata set by the post-processor.\n>  \t * Currently: ANDROID_JPEG_SIZE (int32_t), ANDROID_JPEG_QUALITY (byte),\n\nThis line should be broken out too\n\n \t * Currently:\n\t * ANDROID_JPEG_SIZE (int32_t) = 4 bytes\n\t * ANDROID_JPEG_QUALITY (byte) = 1 byte\n\nAll the rest looks good.\n\n> -\t * ANDROID_JPEG_ORIENTATION (int32_t) = 3 entries, 9 bytes.\n> +\t * ANDROID_JPEG_GPS_COORDINATES (double x 3) = 24 bytes\n> +\t * ANDROID_JPEG_GPS_PROCESSING_METHOD (byte x 32) = 32 bytes\n> +\t * ANDROID_JPEG_GPS_TIMESTAMP (int64) = 8 bytes\n> +\t * ANDROID_JPEG_ORIENTATION (int32_t) = 4 bytes\n> +\t * Total bytes for JPEG metadata: 73\n>  \t */\n>  \tstd::unique_ptr<CameraMetadata> resultMetadata =\n> -\t\tstd::make_unique<CameraMetadata>(33, 75);\n> +\t\tstd::make_unique<CameraMetadata>(38, 147);\n>  \tif (!resultMetadata->isValid()) {\n>  \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n>  \t\treturn nullptr;\n> @@ -1984,6 +1994,14 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>  \tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n>  \tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n>  \n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\tresultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);\n> +\n> +\tfloat focal_length = 1.0;\n> +\tresultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length, 1);\n> +\n>  \tvalue = ANDROID_LENS_STATE_STATIONARY;\n>  \tresultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n>  \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index dba351a4..4c8020e5 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -96,12 +96,15 @@ int CameraStream::configure()\n>  }\n>  \n>  int CameraStream::process(const libcamera::FrameBuffer &source,\n> -\t\t\t  MappedCamera3Buffer *dest, CameraMetadata *metadata)\n> +\t\t\t  MappedCamera3Buffer *dest,\n> +\t\t\t  const CameraMetadata &requestMetadata,\n> +\t\t\t  CameraMetadata *resultMetadata)\n>  {\n>  \tif (!postProcessor_)\n>  \t\treturn 0;\n>  \n> -\treturn postProcessor_->process(source, dest->maps()[0], metadata);\n> +\treturn postProcessor_->process(source, dest->maps()[0],\n> +\t\t\t\t       requestMetadata, resultMetadata);\n>  }\n>  \n>  FrameBuffer *CameraStream::getBuffer()\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index cc9d5470..298ffbf6 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -119,7 +119,9 @@ public:\n>  \n>  \tint configure();\n>  \tint process(const libcamera::FrameBuffer &source,\n> -\t\t    MappedCamera3Buffer *dest, CameraMetadata *metadata);\n> +\t\t    MappedCamera3Buffer *dest,\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata);\n>  \tlibcamera::FrameBuffer *getBuffer();\n>  \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n>  \n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index aa0f783d..7e49e9d9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -83,17 +83,26 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n>  \n>  int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t\t\t       Span<uint8_t> destination,\n> -\t\t\t       CameraMetadata *metadata)\n> +\t\t\t       const CameraMetadata &requestMetadata,\n> +\t\t\t       CameraMetadata *resultMetadata)\n>  {\n>  \tif (!encoder_)\n>  \t\treturn 0;\n>  \n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret;\n> +\n>  \t/* Set EXIF metadata for various tags. */\n>  \tExif exif;\n> -\t/* \\todo Set Make and Model from external vendor tags. */\n> -\texif.setMake(\"libcamera\");\n> -\texif.setModel(\"cameraModel\");\n> -\texif.setOrientation(cameraDevice_->orientation());\n> +\texif.setMake(cameraDevice_->maker());\n> +\texif.setModel(cameraDevice_->model());\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry);\n> +\n> +\tconst uint32_t jpegOrientation = ret ? *entry.data.i32 : 0;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpegOrientation, 1);\n> +\texif.setOrientation(jpegOrientation);\n> +\n>  \texif.setSize(streamSize_);\n>  \t/*\n>  \t * We set the frame's EXIF timestamp as the time of encode.\n> @@ -102,6 +111,39 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t */\n>  \texif.setTimestamp(std::time(nullptr), 0ms);\n>  \n> +\t/* \\todo Get this information from libcamera::Request::metadata */\n> +\texif.setExposureTime(0);\n> +\tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\texif.setAperture(*entry.data.f);\n> +\texif.setISO(100);\n> +\texif.setFlash(Exif::Flash::FlashNotPresent);\n> +\texif.setWhiteBalance(Exif::WhiteBalance::Auto);\n> +\n> +\texif.setFocalLength(1.0);\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_TIMESTAMP, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSDateTimestamp(*entry.data.i64);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP,\n> +\t\t\t\t\t entry.data.i64, 1);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_COORDINATES, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSLocation(entry.data.d);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_COORDINATES,\n> +\t\t\t\t\t entry.data.d, 3);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD, &entry);\n> +\tif (ret) {\n> +\t\tstd::string method(entry.data.u8, entry.data.u8 + entry.count);\n> +\t\texif.setGPSMethod(method);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\t\t\t\t entry.data.u8, entry.count);\n> +\t}\n> +\n>  \tstd::vector<unsigned char> thumbnail;\n>  \tgenerateThumbnail(source, &thumbnail);\n>  \tif (!thumbnail.empty())\n> @@ -136,13 +178,12 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \tblob->jpeg_size = jpeg_size;\n>  \n>  \t/* Update the JPEG result Metadata. */\n> -\tmetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n> -\n> -\tconst uint32_t jpeg_quality = 95;\n> -\tmetadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);\n> +\tresultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n>  \n> -\tconst uint32_t jpeg_orientation = 0;\n> -\tmetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpeg_orientation, 1);\n> +\t/* \\todo Configure JPEG encoder with this */\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);\n> +\tconst uint8_t jpegQuality = ret ? *entry.data.u8 : 95;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpegQuality, 1);\n>  \n>  \treturn 0;\n>  }\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 5afa831c..d721d1b9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -26,7 +26,8 @@ public:\n>  \t\t      const libcamera::StreamConfiguration &outcfg) override;\n>  \tint process(const libcamera::FrameBuffer &source,\n>  \t\t    libcamera::Span<uint8_t> destination,\n> -\t\t    CameraMetadata *metadata) override;\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata) override;\n>  \n>  private:\n>  \tvoid generateThumbnail(const libcamera::FrameBuffer &source,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index e0f91880..bda93bb4 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -22,7 +22,8 @@ public:\n>  \t\t\t      const libcamera::StreamConfiguration &outCfg) = 0;\n>  \tvirtual int process(const libcamera::FrameBuffer &source,\n>  \t\t\t    libcamera::Span<uint8_t> destination,\n> -\t\t\t    CameraMetadata *metadata) = 0;\n> +\t\t\t    const CameraMetadata &requestMetadata,\n> +\t\t\t    CameraMetadata *resultMetadata) = 0;\n>  };\n>  \n>  #endif /* __ANDROID_POST_PROCESSOR_H__ */","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4A9A9C0F2B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jan 2021 13:22:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B8C1B68306;\n\tTue, 26 Jan 2021 14:22:09 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AD2A7682EC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jan 2021 14:22:08 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2703F2C1;\n\tTue, 26 Jan 2021 14:22:08 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"u1gTipCP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611667328;\n\tbh=d+SBceU4azwBubKs1X+nRbx7muY8Vd5UXzSWVytPY8o=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=u1gTipCPiWEMrOGuqP7A3T81xVggMBuyW2692+9oHs1PqluS9Kg+Bf6WLopE05FTo\n\tMm8ON5EFjVf8LK+ESA0XBnYqrkgiRnf09dD1KYsO25I0Ig4JjofF7DTce+aaopjYfq\n\thCt6W/9Y8WbT9AVjHAskJCv6df4kmshDZ9CWNwYk=","Date":"Tue, 26 Jan 2021 15:21:48 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Paul Elder <paul.elder@ideasonboard.com>","Message-ID":"<YBAXbIQhHp4AHwM0@pendragon.ideasonboard.com>","References":"<20210126102825.147026-1-paul.elder@ideasonboard.com>\n\t<20210126102825.147026-6-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210126102825.147026-6-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":14783,"web_url":"https://patchwork.libcamera.org/comment/14783/","msgid":"<YBAYWm0VM+5uFIWI@pendragon.ideasonboard.com>","date":"2021-01-26T13:25:46","subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nAnother comment.\n\nOn Tue, Jan 26, 2021 at 07:28:22PM +0900, Paul Elder wrote:\n> Set the following android result metadata:\n> - ANDROID_LENS_FOCAL_LENGTH\n> - ANDROID_LENS_APERTURE\n> - ANDROID_JPEG_GPS_TIMESTAMP\n> - ANDROID_JPEG_GPS_COORDINATES\n> - ANDROID_JPEG_GPS_PROCESSING_METHOD\n> - ANDROID_JPEG_SIZE\n> - ANDROID_JPEG_QUALITY\n> - ANDROID_JPEG_ORIENTATION\n\nThe last three were already set btw. The code is fine, it's just about\nthe commit message.\n\n> And the following EXIF fields:\n> - GPSDatestamp\n> - GPSTimestamp\n> - GPSLocation\n>   - GPSLatitudeRef\n>   - GPSLatitude\n>   - GPSLongitudeRef\n>   - GPSLongitude\n>   - GPSAltitudeRef\n>   - GPSAltitude\n> - GPSProcessingMethod\n> - FocalLength\n> - ExposureTime\n> - FNumber\n> - ISO\n> - Flash\n> - WhiteBalance\n> - SubsecTime\n> - SubsecTimeOriginal\n> - SubsecTimeDigitized\n> \n> Based on android request metadata.\n> \n> This allows the following CTS tests to pass:\n> - android.hardware.camera2.cts.StillCaptureTest#testFocalLengths\n> - android.hardware.camera2.cts.StillCaptureTest#testJpegExif\n> \n> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> ---\n> Changes in v5:\n> - fix jpegQuality type\n> - drop todo about handling null request settings that's fixed in a later\n>   patch\n> - add todo about getting exif information from\n>   libcamera::Request::metadata\n> - fix JPEG metadata size allocation comment, add total\n> - add metadata entries to availableResultKeys and add the necessary\n>   bytes to the static metadata pack size\n> \n> Changes in v4:\n> - remove unused variable\n> - move android JPEG thumbnail tags allocation to the thumbnail patch\n> - move setting the timestamp with subsec to the patch that adds set\n>   subsec to timestamp (\"android: jpeg: exif: Add functions for\n>   setting various values\")\n> - group setting GPS-related tags\n> \n> Changes in v3:\n> - fix metadata entries and byte count\n> - fix gps processing method string truncation\n> - move thumbnail handling to a different patch\n> \n> Changes in v2:\n> - break out processControls and thumbnailer configuration into\n>   different\n>   patches\n> - fix android metadata entry number and size\n> - other small changes\n> ---\n>  src/android/camera_device.cpp            | 26 ++++++++--\n>  src/android/camera_stream.cpp            |  7 ++-\n>  src/android/camera_stream.h              |  4 +-\n>  src/android/jpeg/post_processor_jpeg.cpp | 63 +++++++++++++++++++-----\n>  src/android/jpeg/post_processor_jpeg.h   |  3 +-\n>  src/android/post_processor.h             |  3 +-\n>  6 files changed, 86 insertions(+), 20 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 7929877c..096c2463 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -708,7 +708,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()\n>  \t * Currently: 53 entries, 782 bytes of static metadata\n>  \t */\n>  \tuint32_t numEntries = 53;\n> -\tuint32_t byteSize = 782;\n> +\tuint32_t byteSize = 802;\n>  \n>  \t/*\n>  \t * Calculate space occupation in bytes for dynamically built metadata\n> @@ -1253,6 +1253,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n>  \t\tANDROID_FLASH_MODE,\n>  \t\tANDROID_FLASH_STATE,\n> +\t\tANDROID_LENS_APERTURE,\n> +\t\tANDROID_LENS_FOCAL_LENGTH,\n>  \t\tANDROID_LENS_STATE,\n>  \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n>  \t\tANDROID_SENSOR_TIMESTAMP,\n> @@ -1264,6 +1266,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\tANDROID_NOISE_REDUCTION_MODE,\n>  \t\tANDROID_REQUEST_PIPELINE_DEPTH,\n>  \t\tANDROID_SCALER_CROP_REGION,\n> +\t\tANDROID_JPEG_GPS_COORDINATES,\n> +\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\tANDROID_JPEG_GPS_TIMESTAMP,\n>  \t\tANDROID_JPEG_SIZE,\n>  \t\tANDROID_JPEG_QUALITY,\n>  \t\tANDROID_JPEG_ORIENTATION,\n> @@ -1816,6 +1821,7 @@ void CameraDevice::requestComplete(Request *request)\n>  \t\t}\n>  \n>  \t\tint ret = cameraStream->process(*buffer, &mapped,\n> +\t\t\t\t\t\tdescriptor->settings_,\n>  \t\t\t\t\t\tresultMetadata.get());\n>  \t\tif (ret) {\n>  \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> @@ -1912,14 +1918,18 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>  \n>  \t/*\n>  \t * \\todo Keep this in sync with the actual number of entries.\n> -\t * Currently: 33 entries, 75 bytes\n> +\t * Currently: 38 entries, 147 bytes\n>  \t *\n>  \t * Reserve more space for the JPEG metadata set by the post-processor.\n>  \t * Currently: ANDROID_JPEG_SIZE (int32_t), ANDROID_JPEG_QUALITY (byte),\n> -\t * ANDROID_JPEG_ORIENTATION (int32_t) = 3 entries, 9 bytes.\n> +\t * ANDROID_JPEG_GPS_COORDINATES (double x 3) = 24 bytes\n> +\t * ANDROID_JPEG_GPS_PROCESSING_METHOD (byte x 32) = 32 bytes\n> +\t * ANDROID_JPEG_GPS_TIMESTAMP (int64) = 8 bytes\n> +\t * ANDROID_JPEG_ORIENTATION (int32_t) = 4 bytes\n> +\t * Total bytes for JPEG metadata: 73\n>  \t */\n>  \tstd::unique_ptr<CameraMetadata> resultMetadata =\n> -\t\tstd::make_unique<CameraMetadata>(33, 75);\n> +\t\tstd::make_unique<CameraMetadata>(38, 147);\n>  \tif (!resultMetadata->isValid()) {\n>  \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n>  \t\treturn nullptr;\n> @@ -1984,6 +1994,14 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n>  \tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n>  \tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n>  \n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\tresultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);\n> +\n> +\tfloat focal_length = 1.0;\n> +\tresultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length, 1);\n> +\n>  \tvalue = ANDROID_LENS_STATE_STATIONARY;\n>  \tresultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n>  \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index dba351a4..4c8020e5 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -96,12 +96,15 @@ int CameraStream::configure()\n>  }\n>  \n>  int CameraStream::process(const libcamera::FrameBuffer &source,\n> -\t\t\t  MappedCamera3Buffer *dest, CameraMetadata *metadata)\n> +\t\t\t  MappedCamera3Buffer *dest,\n> +\t\t\t  const CameraMetadata &requestMetadata,\n> +\t\t\t  CameraMetadata *resultMetadata)\n>  {\n>  \tif (!postProcessor_)\n>  \t\treturn 0;\n>  \n> -\treturn postProcessor_->process(source, dest->maps()[0], metadata);\n> +\treturn postProcessor_->process(source, dest->maps()[0],\n> +\t\t\t\t       requestMetadata, resultMetadata);\n>  }\n>  \n>  FrameBuffer *CameraStream::getBuffer()\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index cc9d5470..298ffbf6 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -119,7 +119,9 @@ public:\n>  \n>  \tint configure();\n>  \tint process(const libcamera::FrameBuffer &source,\n> -\t\t    MappedCamera3Buffer *dest, CameraMetadata *metadata);\n> +\t\t    MappedCamera3Buffer *dest,\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata);\n>  \tlibcamera::FrameBuffer *getBuffer();\n>  \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n>  \n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index aa0f783d..7e49e9d9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -83,17 +83,26 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n>  \n>  int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t\t\t       Span<uint8_t> destination,\n> -\t\t\t       CameraMetadata *metadata)\n> +\t\t\t       const CameraMetadata &requestMetadata,\n> +\t\t\t       CameraMetadata *resultMetadata)\n>  {\n>  \tif (!encoder_)\n>  \t\treturn 0;\n>  \n> +\tcamera_metadata_ro_entry_t entry;\n> +\tint ret;\n> +\n>  \t/* Set EXIF metadata for various tags. */\n>  \tExif exif;\n> -\t/* \\todo Set Make and Model from external vendor tags. */\n> -\texif.setMake(\"libcamera\");\n> -\texif.setModel(\"cameraModel\");\n> -\texif.setOrientation(cameraDevice_->orientation());\n> +\texif.setMake(cameraDevice_->maker());\n> +\texif.setModel(cameraDevice_->model());\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry);\n> +\n> +\tconst uint32_t jpegOrientation = ret ? *entry.data.i32 : 0;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpegOrientation, 1);\n> +\texif.setOrientation(jpegOrientation);\n> +\n>  \texif.setSize(streamSize_);\n>  \t/*\n>  \t * We set the frame's EXIF timestamp as the time of encode.\n> @@ -102,6 +111,39 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \t */\n>  \texif.setTimestamp(std::time(nullptr), 0ms);\n>  \n> +\t/* \\todo Get this information from libcamera::Request::metadata */\n> +\texif.setExposureTime(0);\n> +\tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n> +\tif (ret)\n> +\t\texif.setAperture(*entry.data.f);\n> +\texif.setISO(100);\n> +\texif.setFlash(Exif::Flash::FlashNotPresent);\n> +\texif.setWhiteBalance(Exif::WhiteBalance::Auto);\n> +\n> +\texif.setFocalLength(1.0);\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_TIMESTAMP, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSDateTimestamp(*entry.data.i64);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP,\n> +\t\t\t\t\t entry.data.i64, 1);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_COORDINATES, &entry);\n> +\tif (ret) {\n> +\t\texif.setGPSLocation(entry.data.d);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_COORDINATES,\n> +\t\t\t\t\t entry.data.d, 3);\n> +\t}\n> +\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD, &entry);\n> +\tif (ret) {\n> +\t\tstd::string method(entry.data.u8, entry.data.u8 + entry.count);\n> +\t\texif.setGPSMethod(method);\n> +\t\tresultMetadata->addEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD,\n> +\t\t\t\t\t entry.data.u8, entry.count);\n> +\t}\n> +\n>  \tstd::vector<unsigned char> thumbnail;\n>  \tgenerateThumbnail(source, &thumbnail);\n>  \tif (!thumbnail.empty())\n> @@ -136,13 +178,12 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n>  \tblob->jpeg_size = jpeg_size;\n>  \n>  \t/* Update the JPEG result Metadata. */\n> -\tmetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n> -\n> -\tconst uint32_t jpeg_quality = 95;\n> -\tmetadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);\n> +\tresultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n>  \n> -\tconst uint32_t jpeg_orientation = 0;\n> -\tmetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpeg_orientation, 1);\n> +\t/* \\todo Configure JPEG encoder with this */\n> +\tret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);\n> +\tconst uint8_t jpegQuality = ret ? *entry.data.u8 : 95;\n> +\tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpegQuality, 1);\n>  \n>  \treturn 0;\n>  }\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 5afa831c..d721d1b9 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -26,7 +26,8 @@ public:\n>  \t\t      const libcamera::StreamConfiguration &outcfg) override;\n>  \tint process(const libcamera::FrameBuffer &source,\n>  \t\t    libcamera::Span<uint8_t> destination,\n> -\t\t    CameraMetadata *metadata) override;\n> +\t\t    const CameraMetadata &requestMetadata,\n> +\t\t    CameraMetadata *resultMetadata) override;\n>  \n>  private:\n>  \tvoid generateThumbnail(const libcamera::FrameBuffer &source,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index e0f91880..bda93bb4 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -22,7 +22,8 @@ public:\n>  \t\t\t      const libcamera::StreamConfiguration &outCfg) = 0;\n>  \tvirtual int process(const libcamera::FrameBuffer &source,\n>  \t\t\t    libcamera::Span<uint8_t> destination,\n> -\t\t\t    CameraMetadata *metadata) = 0;\n> +\t\t\t    const CameraMetadata &requestMetadata,\n> +\t\t\t    CameraMetadata *resultMetadata) = 0;\n>  };\n>  \n>  #endif /* __ANDROID_POST_PROCESSOR_H__ */","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 50AACBD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jan 2021 13:26:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CC3EF682EC;\n\tTue, 26 Jan 2021 14:26:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EC78F682EC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jan 2021 14:26:05 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 543A42C1;\n\tTue, 26 Jan 2021 14:26:05 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"BR0J+bh3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611667565;\n\tbh=ncak6LXnMwJzewnTZgFnYiP/qkQKaFNTe7jX6Zbpass=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=BR0J+bh36gnoSZiaNm98YVs2bKke+CCY18iPa2gD21UlOw4gdZIiUtFXBO0t1duOz\n\tc+L4uklLMf0hVZibjgsojOoPqkpM2LtXSB/NMfgs+KZHPc0lkL22/MUSEZbUvmhh0J\n\t8NxWed/rAaPbSMmKqIQEXyZyXP/049/bHQq2HETU=","Date":"Tue, 26 Jan 2021 15:25:46 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Paul Elder <paul.elder@ideasonboard.com>","Message-ID":"<YBAYWm0VM+5uFIWI@pendragon.ideasonboard.com>","References":"<20210126102825.147026-1-paul.elder@ideasonboard.com>\n\t<20210126102825.147026-6-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210126102825.147026-6-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 5/8] android: Set result metadata\n\tand EXIF fields based on request metadata","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]