Camera3: Use proper timestamp clock domain for different streams
If buffer consumers assume different clock domain compared to the camera
output, camera3 device uses the offset between the clock domains to convert
the timestamp.
Bug: 27153476
Change-Id: Iaae33281411cb27b639e87b0dad957d640182898
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.h b/services/camera/libcameraservice/device3/Camera3OutputStream.h
index c2c3452..a883448 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.h
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.h
@@ -81,7 +81,7 @@
Camera3OutputStream(int id, sp<Surface> consumer,
uint32_t width, uint32_t height, int format,
android_dataspace dataSpace, camera3_stream_rotation_t rotation,
- int setId = CAMERA3_STREAM_SET_ID_INVALID);
+ nsecs_t timestampOffset, int setId = CAMERA3_STREAM_SET_ID_INVALID);
/**
* Set up a stream for formats that have a variable buffer size for the same
@@ -92,7 +92,7 @@
Camera3OutputStream(int id, sp<Surface> consumer,
uint32_t width, uint32_t height, size_t maxSize, int format,
android_dataspace dataSpace, camera3_stream_rotation_t rotation,
- int setId = CAMERA3_STREAM_SET_ID_INVALID);
+ nsecs_t timestampOffset, int setId = CAMERA3_STREAM_SET_ID_INVALID);
virtual ~Camera3OutputStream();
@@ -167,8 +167,8 @@
// Name of Surface consumer
String8 mConsumerName;
- // Whether to timestamp the output buffer
- bool mTimestampBuffer;
+ // Whether consumer assumes MONOTONIC timestamp
+ bool mUseMonoTimestamp;
/**
* GraphicBuffer manager this stream is registered to. Used to replace the buffer
@@ -186,6 +186,12 @@
* Flag indicating if the buffer manager is used to allocate the stream buffers
*/
bool mUseBufferManager;
+
+ /**
+ * Timestamp offset for video and hardware composer consumed streams
+ */
+ nsecs_t mTimestampOffset;
+
/**
* Internal Camera3Stream interface
*/