{"id":3947,"url":"https://patchwork.libcamera.org/api/1.1/patches/3947/?format=json","web_url":"https://patchwork.libcamera.org/patch/3947/","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":"<20200605141002.49119-4-jacopo@jmondi.org>","date":"2020-06-05T14:09:57","name":"[libcamera-devel,v3,3/8] android: camera_device: Replace hardcoded stream configuration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c0c79e3df73ecc6e0f0378aca658fbf66f65c158","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/3947/mbox/","series":[{"id":958,"url":"https://patchwork.libcamera.org/api/1.1/series/958/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=958","date":"2020-06-05T14:09:54","name":"android: Build stream configuration map","version":3,"mbox":"https://patchwork.libcamera.org/series/958/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3947/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3947/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CFDB461626\n\tfor ;\n\tFri, 5 Jun 2020 16:07:09 +0200 (CEST)","from localhost.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id B0BB22000D;\n\tFri, 5 Jun 2020 14:07:07 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Jun 2020 16:09:57 +0200","Message-Id":"<20200605141002.49119-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200605141002.49119-1-jacopo@jmondi.org>","References":"<20200605141002.49119-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 3/8] android: camera_device: Replace\n\thardcoded stream configuration","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","X-List-Received-Date":"Fri, 05 Jun 2020 14:07:10 -0000"},"content":"Replace the hardcoded stream configuration map with the information\ncollected at CameraDevice initialization time.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 41 ++++++++++++++++++++---------------\n 1 file changed, 23 insertions(+), 18 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c65295a32f3f..7e3df2503468 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -655,23 +655,24 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n \t\t\t\t &maxDigitalZoom, 1);\n \n-\tstd::vector availableStreamFormats = {\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED,\n-\t};\n+\tstd::vector availableStreamFormats;\n+\tavailableStreamFormats.reserve(streamConfigurations_.size());\n+\tstd::transform(streamConfigurations_.begin(), streamConfigurations_.end(),\n+\t\t std::back_inserter(availableStreamFormats),\n+\t\t [](const auto &entry) { return entry.androidScalerCode; });\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_FORMATS,\n \t\t\t\t availableStreamFormats.data(),\n \t\t\t\t availableStreamFormats.size());\n \n-\tstd::vector availableStreamConfigurations = {\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920,\n-\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888, 2560, 1920,\n-\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED, 2560, 1920,\n-\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,\n-\t};\n+\tstd::vector availableStreamConfigurations;\n+\tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n+\tfor (const auto &entry : streamConfigurations_) {\n+\t\tavailableStreamConfigurations.push_back(entry.androidScalerCode);\n+\t\tavailableStreamConfigurations.push_back(entry.resolution.width);\n+\t\tavailableStreamConfigurations.push_back(entry.resolution.height);\n+\t\tavailableStreamConfigurations.push_back(\n+\t\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);\n+\t}\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n \t\t\t\t availableStreamConfigurations.data(),\n \t\t\t\t availableStreamConfigurations.size());\n@@ -683,11 +684,15 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t availableStallDurations.data(),\n \t\t\t\t availableStallDurations.size());\n \n-\tstd::vector minFrameDurations = {\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED, 2560, 1920, 33333333,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888, 2560, 1920, 33333333,\n-\t};\n+\t/* \\todo Collect the minimum frame duration from the camera. */\n+\tstd::vector minFrameDurations;\n+\tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n+\tfor (const auto &entry : streamConfigurations_) {\n+\t\tminFrameDurations.push_back(entry.androidScalerCode);\n+\t\tminFrameDurations.push_back(entry.resolution.width);\n+\t\tminFrameDurations.push_back(entry.resolution.height);\n+\t\tminFrameDurations.push_back(33333333);\n+\t}\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n \t\t\t\t minFrameDurations.data(),\n \t\t\t\t minFrameDurations.size());\n","prefixes":["libcamera-devel","v3","3/8"]}