Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DngCreator: Fix calculation of date/time stamps" into nyc-mr1-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2016-09-19 19:27:30 +00:00
committed by Android (Google) Code Review
parent d031d57c9e 3fc21ef78b
commit 4188477b2f
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/hardware/camera2/DngCreator.java
View File

@@ -27,6 +27,7 @@ import android.location.Location;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.media.Image; import android.media.Image;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log;
import android.util.Size; import android.util.Size;
import java.io.IOException; import java.io.IOException;
@@ -89,17 +90,33 @@ public final class DngCreator implements AutoCloseable {
throw new IllegalArgumentException("Null argument to DngCreator constructor"); throw new IllegalArgumentException("Null argument to DngCreator constructor");
} }
// Find current time // Find current time in milliseconds since 1970
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
// Assume that sensor timestamp has that timebase to start
long timeOffset = 0;
// Find boot time int timestampSource = characteristics.get(
long bootTimeMillis = currentTime - SystemClock.elapsedRealtime(); CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE);
if (timestampSource == CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME) {
// This means the same timebase as SystemClock.elapsedRealtime(),
// which is CLOCK_BOOTTIME
timeOffset = currentTime - SystemClock.elapsedRealtime();
} else if (timestampSource == CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN) {
// This means the same timebase as System.currentTimeMillis(),
// which is CLOCK_MONOTONIC
timeOffset = currentTime - SystemClock.uptimeMillis();
} else {
// Unexpected time source - treat as CLOCK_MONOTONIC
Log.w(TAG, "Sensor timestamp source is unexpected: " + timestampSource);
timeOffset = currentTime - SystemClock.uptimeMillis();
}
// Find capture time (nanos since boot) // Find capture time (nanos since boot)
Long timestamp = metadata.get(CaptureResult.SENSOR_TIMESTAMP); Long timestamp = metadata.get(CaptureResult.SENSOR_TIMESTAMP);
long captureTime = currentTime; long captureTime = currentTime;
if (timestamp != null) { if (timestamp != null) {
captureTime = timestamp / 1000000 + bootTimeMillis; captureTime = timestamp / 1000000 + timeOffset;
} }
// Format for metadata // Format for metadata