diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-07-14 23:03:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-14 23:03:42 +0000 |
| commit | 726d4ddd5f93a93f2e4acca3228b55a0cd7dfba3 (patch) | |
| tree | c32b8e824e3a33ed87d9985fa92a60f6f40e80c3 | |
| parent | 67b3379367545d2cd1757197748b0781ac1f5fc0 (diff) | |
| parent | ece15b4fa7cc4c622e41cc9a4cd28187ae584e9e (diff) | |
| download | bullhead-726d4ddd5f93a93f2e4acca3228b55a0cd7dfba3.tar.gz | |
Merge "QCamera2: HAL3: correct timestamp calculation in HFR mode" into nyc-mr1-dev
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 61ce2b2..a881f04 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -2379,9 +2379,9 @@ void QCamera3HardwareInterface::handleBatchMetadata( if (last_frame_capture_time) { //Infer timestamp first_frame_capture_time = last_frame_capture_time - - (((loopCount - 1) * NSEC_PER_SEC) / mHFRVideoFps); + (((loopCount - 1) * NSEC_PER_SEC) / (double) mHFRVideoFps); capture_time = - first_frame_capture_time + (i * NSEC_PER_SEC / mHFRVideoFps); + first_frame_capture_time + (i * NSEC_PER_SEC / (double) mHFRVideoFps); ADD_SET_PARAM_ENTRY_TO_BATCH(metadata, CAM_INTF_META_SENSOR_TIMESTAMP, capture_time); CDBG_HIGH("%s: batch capture_time: %lld, capture_time: %lld", |