Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd783345 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "libcameraservice: Use the correct vendor tag id type on... 

Merge "libcameraservice: Use the correct vendor tag id type on filterParameters" into main am: f67acbd3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3012034



Change-Id: Ied38e0855f3dad533445bbcc8c71111a7c75aca5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9dc24bd9 f67acbd3

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/camera/libcameraservice/utils/SessionConfigurationUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -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;