49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
From ab96b0bbaa4bd636121f8015cf9b0406625513d2 Mon Sep 17 00:00:00 2001
|
|
From: danielml <daniel@danielml.dev>
|
|
Date: Tue, 26 Mar 2024 11:49:00 +0100
|
|
Subject: [PATCH 6/6] libcameraservice: Use the correct vendor tag id type on
|
|
filterParameters
|
|
|
|
This fixes an overflow caused by using the `int` type, thus breaking
|
|
the camera on cases where the actual vendor tag id is bigger than the
|
|
maximum value `int` can hold.
|
|
|
|
Test: Open camera, make sure that preview shows correctly and that
|
|
there are no vendor tag errors in logs.
|
|
Change-Id: Ia00e9e3fcc737bfaf0a917f11690f15d686441ba
|
|
Signed-off-by: danielml <daniel@danielml.dev>
|
|
---
|
|
.../camera/libcameraservice/utils/SessionConfigurationUtils.cpp | 2 +-
|
|
.../camera/libcameraservice/utils/SessionConfigurationUtils.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
|
|
index 3be8e15161..384f53e23d 100644
|
|
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
|
|
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
|
|
@@ -1133,7 +1133,7 @@ status_t mapRequestTemplateToAidl(camera_request_template_t templateId,
|
|
}
|
|
|
|
void filterParameters(const CameraMetadata& src, const CameraMetadata& deviceInfo,
|
|
- int vendorTagId, CameraMetadata& dst) {
|
|
+ metadata_vendor_id_t vendorTagId, CameraMetadata& dst) {
|
|
const CameraMetadata params(src);
|
|
camera_metadata_ro_entry_t availableSessionKeys = deviceInfo.find(
|
|
ANDROID_REQUEST_AVAILABLE_SESSION_KEYS);
|
|
diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
|
|
index 29e3eca9af..5b2ea5c06f 100644
|
|
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
|
|
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
|
|
@@ -177,7 +177,7 @@ status_t mapRequestTemplateToAidl(camera_request_template_t templateId,
|
|
aidl::android::hardware::camera::device::RequestTemplate* tempId /*out*/);
|
|
|
|
void filterParameters(const CameraMetadata& src, const CameraMetadata& deviceInfo,
|
|
- int vendorTagId, CameraMetadata& dst);
|
|
+ metadata_vendor_id_t vendorTagId, CameraMetadata& dst);
|
|
|
|
constexpr int32_t MAX_SURFACES_PER_STREAM = 4;
|
|
|
|
--
|
|
2.43.1
|
|
|