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

Commit d6b51642 authored by Avichal Rakesh's avatar Avichal Rakesh
Browse files

cameraservice: Allow AIDL Devices to not support sensor readout timestamp 

CameraService currently force adds
ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE to all AIDL devices. This
effectively means all Camera HALs implementing the AIDL interfaces
are forced to support sensor timestamp.

Forcing AIDL HALs to support sensor readout timestamp means HALs will
have to fake sensor readout value if the camera sensor does not report
sensor readout timestamp (for example in the case of ExternalCameraHAL).

This CL allows AIDL HALs to not support sensor readout timestamp.

Bug: 309543399
Test: ReadoutTimestampTest#testReadoutTimestamp passes for
      ExternalCameraHAL
Test: atest CtsCameraTestCases:android.hardware.camera2.cts.ReadoutTimestampTest
      passes for normal AIDL HALs when the value is not explicitly set.
Change-Id: Iecf84372f2f6e2812d9c148a94b15eed01917fb1
parent bc5ff305

services/camera/libcameraservice/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ cc_defaults { 
        "android.frameworks.cameraservice.device-V2-ndk",

        "android.hardware.camera.common-V1-ndk",

        "android.hardware.camera.device-V3-ndk",

        "android.hardware.camera.metadata-V2-ndk",

        "android.hardware.camera.metadata-V3-ndk",

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.provider@2.5",

        "android.hardware.camera.provider@2.6",

services/camera/libcameraservice/common/CameraProviderManager.cpp

+5 −10
Original line number Diff line number Diff line
@@ -1807,18 +1807,13 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addReadoutTimestampTa 
    auto& c = mCameraCharacteristics;



    auto entry = c.find(ANDROID_SENSOR_READOUT_TIMESTAMP);

    if (entry.count != 0) {

        ALOGE("%s: CameraCharacteristics must not contain ANDROID_SENSOR_READOUT_TIMESTAMP!",

                __FUNCTION__);

    }



    uint8_t readoutTimestamp = ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED;

    if (readoutTimestampSupported) {

        readoutTimestamp = ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE;

    if (entry.count == 0) {

        uint8_t defaultReadoutTimestamp = readoutTimestampSupported ?

                                          ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE :

                                          ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED;

        res = c.update(ANDROID_SENSOR_READOUT_TIMESTAMP, &defaultReadoutTimestamp, 1);

    }



    res = c.update(ANDROID_SENSOR_READOUT_TIMESTAMP, &readoutTimestamp, 1);



    return res;

}

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

+13 −2
Original line number Diff line number Diff line
@@ -337,6 +337,16 @@ status_t AidlCamera3Device::initialize(sp<CameraProviderManager> manager, 


    mBatchSizeLimitEnabled = (deviceVersion >= CAMERA_DEVICE_API_VERSION_1_2);



    camera_metadata_entry readoutSupported = mDeviceInfo.find(ANDROID_SENSOR_READOUT_TIMESTAMP);

    if (readoutSupported.count == 0) {

        ALOGW("%s: Could not find value corresponding to ANDROID_SENSOR_READOUT_TIMESTAMP. "

              "Assuming true.", __FUNCTION__);

        mSensorReadoutTimestampSupported = true;

    } else {

        mSensorReadoutTimestampSupported =

                readoutSupported.data.u8[0] == ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE;

    }



    return initializeCommonLocked();

}
@@ -450,7 +460,7 @@ status_t AidlCamera3Device::initialize(sp<CameraProviderManager> manager, 
        mOverrideToPortrait, mActivePhysicalId}, mResultMetadataQueue

    };

    for (const auto& msg : msgs) {

        camera3::notify(states, msg);

        camera3::notify(states, msg, mSensorReadoutTimestampSupported);

    }

    return ::ndk::ScopedAStatus::ok();
@@ -621,7 +631,8 @@ status_t AidlCamera3Device::switchToOffline( 
            mZoomRatioMappers, mRotateAndCropMappers);



    *session = new AidlCamera3OfflineSession(mId, inputStream, offlineStreamSet,

            std::move(bufferRecords), offlineReqs, offlineStates, offlineSession);

                                             std::move(bufferRecords), offlineReqs, offlineStates,

                                             offlineSession, mSensorReadoutTimestampSupported);



    // Delete all streams that has been transferred to offline session

    Mutex::Autolock l(mLock);

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

+3 −0
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ class AidlCamera3Device : 
    // capture requests.

    bool mBatchSizeLimitEnabled = false;



    // Whether the HAL supports reporting sensor readout timestamp

    bool mSensorReadoutTimestampSupported = true;



}; // class AidlCamera3Device



}; // namespace android

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

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ status_t AidlCamera3OfflineSession::initialize(wp<NotificationListener> listener 
        /*overrideToPortrait*/false, activePhysicalId}, mResultMetadataQueue

    };

    for (const auto& msg : msgs) {

        camera3::notify(states, msg);

        camera3::notify(states, msg, mSensorReadoutTimestampSupported);

    }

    return ::ndk::ScopedAStatus::ok();

}