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/CompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/CompositeStream.cpp b/services/camera/libcameraservice/api2/CompositeStream.cpp
index 8cc47ee..503cf23 100644
--- a/services/camera/libcameraservice/api2/CompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/CompositeStream.cpp
@@ -50,7 +50,7 @@
         const std::unordered_set<int32_t> &sensorPixelModesUsed,
         std::vector<int> * surfaceIds,
         int streamSetId, bool isShared, bool isMultiResolution, int32_t colorSpace,
-        int64_t dynamicProfile, int64_t streamUseCase) {
+        int64_t dynamicProfile, int64_t streamUseCase, bool useReadoutTimestamp) {
     if (hasDeferredConsumer) {
         ALOGE("%s: Deferred consumers not supported in case of composite streams!",
                 __FUNCTION__);
@@ -77,7 +77,7 @@
 
     return createInternalStreams(consumers, hasDeferredConsumer, width, height, format, rotation,
             id, physicalCameraId, sensorPixelModesUsed, surfaceIds, streamSetId, isShared,
-            colorSpace, dynamicProfile, streamUseCase);
+            colorSpace, dynamicProfile, streamUseCase, useReadoutTimestamp);
 }
 
 status_t CompositeStream::deleteStream() {