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

Commit 62332132 authored by Rucha Katakwar's avatar Rucha Katakwar Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix up torch strength keys." into tm-dev am: e55db702 

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



Change-Id: Id67d43b4fa24a3de3564e735f2c1a30ef94aab1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7460ae76 e55db702

services/camera/libcameraservice/common/CameraProviderManager.cpp

+28 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,34 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addDynamicDepthTags( 
    return OK;

}



status_t CameraProviderManager::ProviderInfo::DeviceInfo3::fixupTorchStrengthTags() {

    status_t res = OK;

    auto& c = mCameraCharacteristics;

    auto flashInfoStrengthDefaultLevelEntry = c.find(ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL);

    if (flashInfoStrengthDefaultLevelEntry.count == 0) {

        int32_t flashInfoStrengthDefaultLevel = 1;

        res = c.update(ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL,

                &flashInfoStrengthDefaultLevel, 1);

        if (res != OK) {

            ALOGE("%s: Failed to update ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL: %s (%d)",

                    __FUNCTION__,strerror(-res), res);

            return res;

        }

    }

    auto flashInfoStrengthMaximumLevelEntry = c.find(ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL);

    if (flashInfoStrengthMaximumLevelEntry.count == 0) {

        int32_t flashInfoStrengthMaximumLevel = 1;

        res = c.update(ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,

                &flashInfoStrengthMaximumLevel, 1);

        if (res != OK) {

            ALOGE("%s: Failed to update ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL: %s (%d)",

                    __FUNCTION__,strerror(-res), res);

            return res;

        }

    }

    return res;

}



status_t CameraProviderManager::ProviderInfo::DeviceInfo3::fixupMonochromeTags() {

    status_t res = OK;

    auto& c = mCameraCharacteristics;

services/camera/libcameraservice/common/CameraProviderManager.h

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ private: 
            void queryPhysicalCameraIds();

            SystemCameraKind getSystemCameraKind();

            status_t fixupMonochromeTags();

            status_t fixupTorchStrengthTags();

            status_t addDynamicDepthTags(bool maxResolution = false);

            status_t deriveHeicTags(bool maxResolution = false);

            status_t addRotateCropTags();

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+7 −0
Original line number Diff line number Diff line
@@ -538,6 +538,13 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
    if (flashAvailable.count == 1 &&

            flashAvailable.data.u8[0] == ANDROID_FLASH_INFO_AVAILABLE_TRUE) {

        mHasFlashUnit = true;

        // Fix up flash strength tags for devices without these keys.

        res = fixupTorchStrengthTags();

        if (OK != res) {

            ALOGE("%s: Unable to add default ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL and"

                    "ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL tags: %s (%d)", __FUNCTION__,

                    strerror(-res), res);

        }

    } else {

        mHasFlashUnit = false;

    }

services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp

+7 −0
Original line number Diff line number Diff line
@@ -662,6 +662,13 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
    if (flashAvailable.count == 1 &&

            flashAvailable.data.u8[0] == ANDROID_FLASH_INFO_AVAILABLE_TRUE) {

        mHasFlashUnit = true;

        // Fix up flash strength tags for devices without these keys.

        res = fixupTorchStrengthTags();

        if (OK != res) {

            ALOGE("%s: Unable to add default ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL and"

                    "ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL tags: %s (%d)", __FUNCTION__,

                    strerror(-res), res);

        }

    } else {

        mHasFlashUnit = false;

    }