commit bce53dbff29678124626a24afbcd85242b038fce
author Shuzhen Wang <shuzhenwang@google.com> Sat Dec 03 00:38:20 2022 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Mon Dec 19 20:26:02 2022 +0000
tree dc2d9b9edaf9655f5f832cbfb5ec625a8b37550a
parent f5a3c7c4e531f694c7f944d7cab716bfaa5f4284

Camera: Move readoutTimestamp to OutputConfiguration

Whether readoutTimestamp is used should be orthogonal to the timestamp
base being used (DEFAULT, SENSOR, REALTIME, etc). Make them so.

Test: Camera CTS
Bug: 232437315
Change-Id: I7e3e45bc7955da141bd47b3217e30f45ab429cab

services/camera/libcameraservice/api2/JpegRCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
index 8f9d813..fb8979d 100644
--- a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
@@ -532,7 +532,7 @@
         const std::unordered_set<int32_t> &sensorPixelModesUsed,
         std::vector<int> *surfaceIds,
         int /*streamSetId*/, bool /*isShared*/, int32_t colorSpace,
-        int64_t dynamicProfile, int64_t streamUseCase) {
+        int64_t dynamicProfile, int64_t streamUseCase, bool useReadoutTimestamp) {
     sp<CameraDeviceBase> device = mDevice.promote();
     if (!device.get()) {
         ALOGE("%s: Invalid camera device!", __FUNCTION__);
@@ -556,9 +556,9 @@
             static_cast<android_dataspace>(mP010DataSpace), rotation,
             id, physicalCameraId, sensorPixelModesUsed, surfaceIds,
             camera3::CAMERA3_STREAM_SET_ID_INVALID, false /*isShared*/, false /*isMultiResolution*/,
-            GRALLOC_USAGE_SW_READ_OFTEN,
-            mP010DynamicRange,
-            streamUseCase);
+            GRALLOC_USAGE_SW_READ_OFTEN, mP010DynamicRange, streamUseCase,
+            OutputConfiguration::TIMESTAMP_BASE_DEFAULT, OutputConfiguration::MIRROR_MODE_AUTO,
+            ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED, useReadoutTimestamp);
     if (ret == OK) {
         mP010StreamId = *id;
         mP010SurfaceId = (*surfaceIds)[0];
@@ -585,7 +585,7 @@
                 streamUseCase,
                 /*timestampBase*/ OutputConfiguration::TIMESTAMP_BASE_DEFAULT,
                 /*mirrorMode*/ OutputConfiguration::MIRROR_MODE_AUTO,
-                /*colorSpace*/ colorSpace);
+                /*colorSpace*/ colorSpace, useReadoutTimestamp);
         if (ret == OK) {
             mBlobSurfaceId = blobSurfaceId[0];
         } else {