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

Commit 7b14d5e6 authored by Austin Borger's avatar Austin Borger
Browse files

Turn off overrideToPortrait where not needed. 

HIDL devices will not have rotate and crop, so this should be completely
turned off for them. Some other calls to getCameraCharacteristics are in
passing and overrideToPortrait has no impact for them, but turn it off
just in case.

Bug: 273638116
Test: Tested foldable device with/without override.
Change-Id: Id56a1ed0327e343f7f0e0bf161231f302badd12b
parent 2490b2d2

media/libstagefright/CameraSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ status_t CameraSource::isCameraAvailable( 


    if (camera == 0) {

        mCamera = Camera::connect(cameraId, clientName, clientUid, clientPid,

                /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/true);

                /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/false);

        if (mCamera == 0) return -EBUSY;

        mCameraFlags &= ~FLAGS_HOT_CAMERA;

    } else {

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

+3 −2
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ status_t AidlProviderInfo::convertToAidlHALStreamCombinationAndCameraIdsLocked( 
                SessionConfigurationUtils::targetPerfClassPrimaryCamera(

                        perfClassPrimaryCameraIds, cameraId, targetSdkVersion);

        res = mManager->getCameraCharacteristicsLocked(cameraId, overrideForPerfClass, &deviceInfo,

                /*overrideToPortrait*/true);

                /*overrideToPortrait*/false);

        if (res != OK) {

            return res;

        }
@@ -768,7 +768,8 @@ status_t AidlProviderInfo::convertToAidlHALStreamCombinationAndCameraIdsLocked( 
                [this](const String8 &id, bool overrideForPerfClass) {

                    CameraMetadata physicalDeviceInfo;

                    mManager->getCameraCharacteristicsLocked(id.string(), overrideForPerfClass,

                                                   &physicalDeviceInfo, /*overrideToPortrait*/true);

                                                   &physicalDeviceInfo,

                                                   /*overrideToPortrait*/false);

                    return physicalDeviceInfo;

                };

        std::vector<std::string> physicalCameraIds;

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

+2 −2
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ status_t HidlProviderInfo::convertToHALStreamCombinationAndCameraIdsLocked( 
                SessionConfigurationUtils::targetPerfClassPrimaryCamera(

                        perfClassPrimaryCameraIds, cameraId, targetSdkVersion);

        res = mManager->getCameraCharacteristicsLocked(cameraId, overrideForPerfClass, &deviceInfo,

                /*overrideToPortrait*/true);

                /*overrideToPortrait*/false);

        if (res != OK) {

            return res;

        }
@@ -928,7 +928,7 @@ status_t HidlProviderInfo::convertToHALStreamCombinationAndCameraIdsLocked( 
                [this](const String8 &id, bool overrideForPerfClass) {

                    CameraMetadata physicalDeviceInfo;

                    mManager->getCameraCharacteristicsLocked(id.string(), overrideForPerfClass,

                            &physicalDeviceInfo, /*overrideToPortrait*/true);

                            &physicalDeviceInfo, /*overrideToPortrait*/false);

                    return physicalDeviceInfo;

                };

        std::vector<std::string> physicalCameraIds;

services/camera/libcameraservice/device3/aidl/AidlCamera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ status_t AidlCamera3Device::initialize(sp<CameraProviderManager> manager, 
            // Do not override characteristics for physical cameras

            res = manager->getCameraCharacteristics(

                    physicalId, /*overrideForPerfClass*/false, &mPhysicalDeviceInfoMap[physicalId],

                    /*overrideToPortrait*/true);

                    mOverrideToPortrait);

            if (res != OK) {

                SET_ERR_L("Could not retrieve camera %s characteristics: %s (%d)",

                        physicalId.c_str(), strerror(-res), res);

services/camera/libcameraservice/device3/hidl/HidlCamera3Device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ status_t HidlCamera3Device::initialize(sp<CameraProviderManager> manager, 
    }



    res = manager->getCameraCharacteristics(mId.string(), mOverrideForPerfClass, &mDeviceInfo,

            mOverrideToPortrait);

            /*overrideToPortrait*/false);

    if (res != OK) {

        SET_ERR_L("Could not retrieve camera characteristics: %s (%d)", strerror(-res), res);

        session->close();
@@ -178,7 +178,7 @@ status_t HidlCamera3Device::initialize(sp<CameraProviderManager> manager, 
            // Do not override characteristics for physical cameras

            res = manager->getCameraCharacteristics(

                    physicalId, /*overrideForPerfClass*/false, &mPhysicalDeviceInfoMap[physicalId],

                    /*overrideToPortrait*/true);

                    /*overrideToPortrait*/false);

            if (res != OK) {

                SET_ERR_L("Could not retrieve camera %s characteristics: %s (%d)",

                        physicalId.c_str(), strerror(-res), res);