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

Commit b50402ed authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Allow dynamic sensor orientation updates 

Camera characteristics are usually expected to remain
static. However certain devices such as foldables may need
to be able to update specific values in response to various
events which could include device state changes.
Enable camera clients to query such metadata updates and receive
updated sensor orientation values.

Bug: 201005727
Test: Manual using AOSP Camera2 application,
Camera CTS

Change-Id: I9c191879b690929984a2945f744dd8407290cf99
parent dc0f9b7a

camera/ndk/include/camera/NdkCameraMetadataTags.h

+34 −0
Original line number Diff line number Diff line
@@ -4578,6 +4578,25 @@ typedef enum acamera_metadata_tag { 
     *

     * <p>Also defines the direction of rolling shutter readout, which is from top to bottom in

     * the sensor's coordinate system.</p>

     * <p>Starting with Android API level 32, camera clients that query the orientation via

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#get">CameraCharacteristics#get</a> on foldable devices which

     * include logical cameras can receive a value that can dynamically change depending on the

     * device/fold state.

     * Clients are advised to not cache or store the orientation value of such logical sensors.

     * In case repeated queries to CameraCharacteristics are not preferred, then clients can

     * also access the entire mapping from device state to sensor orientation in

     * <a href="https://developer.android.com/reference/android/hardware/camera2/params/DeviceStateOrientationMap.html">DeviceStateOrientationMap</a>.

     * Do note that a dynamically changing sensor orientation value in camera characteristics

     * will not be the best way to establish the orientation per frame. Clients that want to

     * know the sensor orientation of a particular captured frame should query the

     * ACAMERA_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID from the corresponding capture result and

     * check the respective physical camera orientation.</p>

     * <p>Native camera clients must query ACAMERA_INFO_DEVICE_STATE_ORIENTATIONS for the mapping

     * between device state and camera sensor orientation. Dynamic updates to the sensor

     * orientation are not supported in this code path.</p>

     *

     * @see ACAMERA_INFO_DEVICE_STATE_ORIENTATIONS

     * @see ACAMERA_LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID

     */

    ACAMERA_SENSOR_ORIENTATION =                                // int32

            ACAMERA_SENSOR_START + 14,
@@ -6284,6 +6303,21 @@ typedef enum acamera_metadata_tag { 
     */

    ACAMERA_INFO_VERSION =                                      // byte

            ACAMERA_INFO_START + 1,

    /**

     *

     * <p>Type: int64[2*n]</p>

     *

     * <p>This tag may appear in:

     * <ul>

     *   <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li>

     * </ul></p>

     *

     * <p>HAL must populate the array with

     * (hardware::camera::provider::V2_5::DeviceState, sensorOrientation) pairs for each

     * supported device state bitwise combination.</p>

     */

    ACAMERA_INFO_DEVICE_STATE_ORIENTATIONS =                    // int64[2*n]

            ACAMERA_INFO_START + 3,

    ACAMERA_INFO_END,



    /**

services/camera/libcameraservice/common/CameraProviderManager.cpp

+31 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ status_t CameraProviderManager::notifyDeviceStateChange( 
            res = singleRes;

            // continue to do the rest of the providers instead of returning now

        }

        provider->notifyDeviceInfoStateChangeLocked(mDeviceState);

    }

    return res;

}
@@ -2039,6 +2040,14 @@ status_t CameraProviderManager::ProviderInfo::setUpVendorTags() { 
    return OK;

}



void CameraProviderManager::ProviderInfo::notifyDeviceInfoStateChangeLocked(

        hardware::hidl_bitfield<provider::V2_5::DeviceState> newDeviceState) {

    std::lock_guard<std::mutex> lock(mLock);

    for (auto it = mDevices.begin(); it != mDevices.end(); it++) {

        (*it)->notifyDeviceStateChange(newDeviceState);

    }

}



status_t CameraProviderManager::ProviderInfo::notifyDeviceStateChange(

        hardware::hidl_bitfield<provider::V2_5::DeviceState> newDeviceState) {

    mDeviceState = newDeviceState;
@@ -2293,6 +2302,18 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string& 
        return;

    }



    if (mCameraCharacteristics.exists(ANDROID_INFO_DEVICE_STATE_ORIENTATIONS)) {

        const auto &stateMap = mCameraCharacteristics.find(ANDROID_INFO_DEVICE_STATE_ORIENTATIONS);

        if ((stateMap.count > 0) && ((stateMap.count % 2) == 0)) {

            for (size_t i = 0; i < stateMap.count; i += 2) {

                mDeviceStateOrientationMap.emplace(stateMap.data.i64[i], stateMap.data.i64[i+1]);

            }

        } else {

            ALOGW("%s: Invalid ANDROID_INFO_DEVICE_STATE_ORIENTATIONS map size: %zu", __FUNCTION__,

                    stateMap.count);

        }

    }



    mSystemCameraKind = getSystemCameraKind();



    status_t res = fixupMonochromeTags();
@@ -2421,6 +2442,16 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string& 


CameraProviderManager::ProviderInfo::DeviceInfo3::~DeviceInfo3() {}



void CameraProviderManager::ProviderInfo::DeviceInfo3::notifyDeviceStateChange(

        hardware::hidl_bitfield<hardware::camera::provider::V2_5::DeviceState> newState) {



    if (!mDeviceStateOrientationMap.empty() &&

            (mDeviceStateOrientationMap.find(newState) != mDeviceStateOrientationMap.end())) {

        mCameraCharacteristics.update(ANDROID_SENSOR_ORIENTATION,

                &mDeviceStateOrientationMap[newState], 1);

    }

}



status_t CameraProviderManager::ProviderInfo::DeviceInfo3::setTorchMode(bool enabled) {

    return setTorchModeForDevice<InterfaceT>(enabled);

}

services/camera/libcameraservice/common/CameraProviderManager.h

+17 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <camera/VendorTagDescriptor.h>



namespace android {



/**

 * The vendor tag descriptor class that takes HIDL vendor tag information as

 * input. Not part of VendorTagDescriptor class because that class is used
@@ -439,6 +438,15 @@ private: 


        std::vector<std::unordered_set<std::string>> getConcurrentCameraIdCombinations();



        /**

         * Notify 'DeviceInfo' instanced about top-level device physical state changes

         *

         * Note that 'mInterfaceMutex' should be held when calling this method.

         */

        void notifyDeviceInfoStateChangeLocked(

               hardware::hidl_bitfield<hardware::camera::provider::V2_5::DeviceState>

                   newDeviceState);



        /**

         * Query the camera provider for concurrent stream configuration support

         */
@@ -491,6 +499,9 @@ private: 
                return INVALID_OPERATION;

            }

            virtual status_t filterSmallJpegSizes() = 0;

            virtual void notifyDeviceStateChange(

                    hardware::hidl_bitfield<hardware::camera::provider::V2_5::DeviceState>

                        /*newState*/) {}



            template<class InterfaceT>

            sp<InterfaceT> startDeviceInterface();
@@ -551,6 +562,9 @@ private: 
                    bool *status /*out*/)

                    override;

            virtual status_t filterSmallJpegSizes() override;

            virtual void notifyDeviceStateChange(

                    hardware::hidl_bitfield<hardware::camera::provider::V2_5::DeviceState>

                        newState) override;



            DeviceInfo3(const std::string& name, const metadata_vendor_id_t tagId,

                    const std::string &id, uint16_t minorVersion,
@@ -560,6 +574,8 @@ private: 
            virtual ~DeviceInfo3();

        private:

            CameraMetadata mCameraCharacteristics;

            // Map device states to sensor orientations

            std::unordered_map<int64_t, int32_t> mDeviceStateOrientationMap;

            // A copy of mCameraCharacteristics without performance class

            // override

            std::unique_ptr<CameraMetadata> mCameraCharNoPCOverride;