{"id":22119,"url":"https://patchwork.libcamera.org/api/patches/22119/?format=json","web_url":"https://patchwork.libcamera.org/patch/22119/","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":"<20241127092632.3145984-9-chenghaoyang@chromium.org>","date":"2024-11-27T09:25:58","name":"[v2,8/9] android: Add JpegExifMetadata to store tags setting into Exif","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6c8ebba48c0df52a1e391faa559c49cc03304847","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22119/mbox/","series":[{"id":4828,"url":"https://patchwork.libcamera.org/api/series/4828/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4828","date":"2024-11-27T09:25:50","name":"Signal metadataAvailable and Android partial result","version":2,"mbox":"https://patchwork.libcamera.org/series/4828/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22119/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22119/checks/","tags":{},"headers":{"Return-Path":"","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 3853EC3213\n\tfor ;\n\tWed, 27 Nov 2024 09:27:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A11EC660B9;\n\tWed, 27 Nov 2024 10:27:00 +0100 (CET)","from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com\n\t[IPv6:2607:f8b0:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DD997660C2\n\tfor ;\n\tWed, 27 Nov 2024 10:26:51 +0100 (CET)","by mail-pg1-x52b.google.com with SMTP id\n\t41be03b00d2f7-7e6cbf6cd1dso4453571a12.3\n\tfor ;\n\tWed, 27 Nov 2024 01:26:51 -0800 (PST)","from chenghaoyang-low.c.googlers.com.com\n\t(27.247.221.35.bc.googleusercontent.com. [35.221.247.27])\n\tby smtp.gmail.com with ESMTPSA id\n\t41be03b00d2f7-7fbcbfc41f9sm8693027a12.8.2024.11.27.01.26.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 27 Nov 2024 01:26:49 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"cnuCQ81b\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732699610; x=1733304410;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=AoZO/hfgntIi/tXlmTlmoFRfHC/LykvzY6f4ocf5hXU=;\n\tb=cnuCQ81bvlVoz5eoK2Q42jr9WzIELJUokfbYRkXOqm04Ezz7ucLqfIaZG3OrpJTRXB\n\t5pcNBLBf1oqbGRXe6dE98In4EkeebumMq260BqyFZmogajr9y2qs1sEMx3T5j73rQwcb\n\tlraqpFsMAwP0vUBQJEiRHfB48jI2YXlf2Pu1M=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732699610; x=1733304410;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=AoZO/hfgntIi/tXlmTlmoFRfHC/LykvzY6f4ocf5hXU=;\n\tb=gs2nJbvk/HSyp41uXnQa6bblZm1Q0WwyZ1ozBR9qOGgGczewEUHFj5NCYo4L+lQI5x\n\tWEUyR2kIqqzekBvPgdl8pCjXs365AlI/wLQ5c5itCnfureOS081/LfTzxLemZk6mOQkQ\n\t3BVbeD750t3p+xOznzM9OhDrhLRSKpipWfXbaq18kLADCMxdZGj1qoKbQpkM5D5iiHVG\n\tMbx/OaK31PHcm1xS0Tn5Vm8jdeTELd3Q/3hp5mHWb9q4XrezqJl4AiHx5jYFnEff7WlI\n\tOqPgruvyC5wvV0oisFKuPrvR6g11PCwysjP2RQr4CcZs10nNOvger8Gwgp5m6JxgRlbK\n\tzz6A==","X-Gm-Message-State":"AOJu0YzixCRTB5uxvpgW0DIPvIHDHsPsAxwelPFeQhAz+9M1gw6Y7+TA\n\t/PmN99UTKRcX9FoTlkU5hU3Nv0SHfNUdsciFTvkvioGQ4EAuyqR/KFgXi3OfpejSK5gGvt2dudY\n\t=","X-Gm-Gg":"ASbGnctbefb6Y4XCeV8T1C6Xq+FQ/fkUickn5rhFFRiZl7AE3Kmst+cv7QqsMwOr5DS\n\trzJmRynEnRgFoDizs2jMmmLwVsc+fn5M1ArniBRDeHeEbr8TWGya2w1Pc8Wzvm1PZuU7643sUtr\n\t9znYmDhhqMAUzjpPNI9vySlz/5tNJt/0KZ7i8zMmY/wQqKf3N/RtCjv3E6SGIomXS9QFd4ID9Mw\n\t4lLLlcsW971YabYAKZpn+QaMDYuqj5Sm1FaiOHlBXdyKqTJ3Dyty2Q2iBnfXuH07BgxTsAwkzzj\n\tGe/WXBGs/Rmxg1VGIjyKzgsA+YFijYoGOugniKb+jHGOnvEjZtkFQA==","X-Google-Smtp-Source":"AGHT+IHv6ezMs3I6FehAsRDLUMqTqh8pWgFh4NDxShAem9+bDFVkJY8laV14HZD4vuUotwKdgYYWJA==","X-Received":"by 2002:a05:6a20:2583:b0:1db:dae1:22e5 with SMTP id\n\tadf61e73a8af0-1e0e0b2c74emr5364897637.20.1732699609722; \n\tWed, 27 Nov 2024 01:26:49 -0800 (PST)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Han-Lin Chen ,\n\tHarvey Yang ","Subject":"[PATCH v2 8/9] android: Add JpegExifMetadata to store tags setting\n\tinto Exif","Date":"Wed, 27 Nov 2024 09:25:58 +0000","Message-ID":"<20241127092632.3145984-9-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.47.0.338.g60cca15819-goog","In-Reply-To":"<20241127092632.3145984-1-chenghaoyang@chromium.org>","References":"<20241127092632.3145984-1-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Han-Lin Chen \n\nWith partial result, some metadata, which needs to be added into Exif,\nmay be sent back to framework earlier before Jpeg post-processing.\nAdd a type JpegExifMetadata associated with StreamBuffer to store the values,\nso Jpeg post-processing doesn't need to reference to current metadata.\n\nSigned-off-by: Han-Lin Chen \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \n---\n src/android/camera_device.cpp | 26 ++++++++++++++++++++++++\n src/android/camera_device.h | 2 ++\n src/android/camera_request.h | 6 ++++++\n src/android/camera_stream.h | 4 ++++\n src/android/jpeg/post_processor_jpeg.cpp | 12 ++++++-----\n 5 files changed, 45 insertions(+), 5 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 9fd851bc8..e085e18b2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1250,6 +1250,10 @@ void CameraDevice::requestComplete(Request *request)\n \t\tCameraStream *stream = iter->first;\n \t\tStreamBuffer *buffer = iter->second;\n \n+\t\tif (stream->isJpegStream()) {\n+\t\t\tgenerateJpegExifMetadata(descriptor, buffer);\n+\t\t}\n+\n \t\tFrameBuffer *src = request->findBuffer(stream->stream());\n \t\tif (!src) {\n \t\t\tLOG(HAL, Error) << \"Failed to find a source stream buffer\";\n@@ -1443,6 +1447,28 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream,\n \tcallbacks_->notify(callbacks_, ¬ify);\n }\n \n+/*\n+ * Set jpeg metadata used to generate EXIF in the JPEG post processing.\n+ */\n+void CameraDevice::generateJpegExifMetadata(Camera3RequestDescriptor *request,\n+\t\t\t\t\t StreamBuffer *buffer) const\n+{\n+\tconst ControlList &metadata = request->request_->metadata();\n+\tauto &jpegExifMetadata = buffer->jpegExifMetadata;\n+\tjpegExifMetadata.emplace(StreamBuffer::JpegExifMetadata());\n+\n+\tconst int64_t exposureTime = metadata.get(controls::ExposureTime).value_or(0);\n+\tjpegExifMetadata->sensorExposureTime = exposureTime;\n+\n+\t/*\n+\t * todo: Android Sensitivity should only include analog gain X digital\n+\t * gain from sensor. Digital gain on ISP shouldn't be included.\n+\t * Calculate sensitivity accordingly when we can differentiate\n+\t * the source of digital gains.\n+\t */\n+\tjpegExifMetadata->sensorSensitivityISO = 100;\n+}\n+\n /*\n * Produce a set of fixed result metadata.\n */\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 815a695d1..3c46ff918 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -102,6 +102,8 @@ private:\n \tvoid sendCaptureResult(Camera3RequestDescriptor *request) const;\n \tvoid setBufferStatus(StreamBuffer &buffer,\n \t\t\t StreamBuffer::Status status);\n+\tvoid generateJpegExifMetadata(Camera3RequestDescriptor *request,\n+\t\t\t\t StreamBuffer *buffer) const;\n \tstd::unique_ptr getResultMetadata(\n \t\tconst Camera3RequestDescriptor &descriptor) const;\n \ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex bd75d4595..bd87b36fd 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -44,6 +44,11 @@ public:\n \tStreamBuffer(StreamBuffer &&);\n \tStreamBuffer &operator=(StreamBuffer &&);\n \n+\tstruct JpegExifMetadata {\n+\t\tint64_t sensorExposureTime;\n+\t\tint32_t sensorSensitivityISO;\n+\t};\n+\n \tCameraStream *stream;\n \tbuffer_handle_t *camera3Buffer;\n \tstd::unique_ptr frameBuffer;\n@@ -51,6 +56,7 @@ public:\n \tStatus status = Status::Success;\n \tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n \tstd::unique_ptr dstBuffer;\n+\tstd::optional jpegExifMetadata;\n \tCamera3RequestDescriptor *request;\n \n private:\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex 30f64f690..47cd7ab85 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -125,6 +125,10 @@ public:\n \tconst libcamera::StreamConfiguration &configuration() const;\n \tlibcamera::Stream *stream() const;\n \tCameraStream *sourceStream() const { return sourceStream_; }\n+\tbool isJpegStream() const\n+\t{\n+\t\treturn camera3Stream_->format == HAL_PIXEL_FORMAT_BLOB;\n+\t}\n \n \tint configure();\n \tint process(StreamBuffer *streamBuffer);\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex f5a90785d..48782b574 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -112,8 +112,11 @@ void PostProcessorJpeg::process(StreamBuffer *streamBuffer)\n \n \tconst FrameBuffer &source = *streamBuffer->srcBuffer;\n \tCameraBuffer *destination = streamBuffer->dstBuffer.get();\n+\tconst std::optional &jpegExifMetadata =\n+\t\tstreamBuffer->jpegExifMetadata;\n \n \tASSERT(destination->numPlanes() == 1);\n+\tASSERT(jpegExifMetadata.has_value());\n \n \tconst CameraMetadata &requestMetadata = streamBuffer->request->settings_;\n \tCameraMetadata *resultMetadata = streamBuffer->request->resultMetadata_.get();\n@@ -139,15 +142,14 @@ void PostProcessorJpeg::process(StreamBuffer *streamBuffer)\n \t */\n \texif.setTimestamp(std::time(nullptr), 0ms);\n \n-\tret = resultMetadata->getEntry(ANDROID_SENSOR_EXPOSURE_TIME, &entry);\n-\texif.setExposureTime(ret ? *entry.data.i64 : 0);\n+\t/* Exif requires nsec for exposure time */\n+\texif.setExposureTime(jpegExifMetadata->sensorExposureTime * 1000);\n+\texif.setISO(jpegExifMetadata->sensorSensitivityISO);\n+\n \tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n \tif (ret)\n \t\texif.setAperture(*entry.data.f);\n \n-\tret = resultMetadata->getEntry(ANDROID_SENSOR_SENSITIVITY, &entry);\n-\texif.setISO(ret ? *entry.data.i32 : 100);\n-\n \texif.setFlash(Exif::Flash::FlashNotPresent);\n \texif.setWhiteBalance(Exif::WhiteBalance::Auto);\n \n","prefixes":["v2","8/9"]}