| commit | 471e8d44f2ef2bf4ecea97f41e2603187a224e59 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Dec 02 18:48:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 02 18:48:30 2021 +0000 |
| tree | b51b1875bc91818e934e6d765974ad005d92116e | |
| parent | 1a24872c75fb1a89f3b85c521bd0be023d2e3448 [diff] | |
| parent | 796be66410d3dc763940ecf181ac91c011cc5427 [diff] |
Merge "Duration field is 64 bits" am: 2144f9bd55 am: 5fe851abe9 am: d331dc3a64 am: 796be66410 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1876176 Change-Id: Ic69e0c222cf62922f222b84e01ae37e3124389a7
diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp index dab2fef..05124c0 100644 --- a/camera/ndk/impl/ACameraMetadata.cpp +++ b/camera/ndk/impl/ACameraMetadata.cpp
@@ -182,7 +182,7 @@ int64_t format = entry.data.i64[i + STREAM_FORMAT_OFFSET]; int64_t width = entry.data.i64[i + STREAM_WIDTH_OFFSET]; int64_t height = entry.data.i64[i + STREAM_HEIGHT_OFFSET]; - int64_t duration = entry.data.i32[i + STREAM_DURATION_OFFSET]; + int64_t duration = entry.data.i64[i + STREAM_DURATION_OFFSET]; // Leave the unfiltered format in so apps depending on previous wrong // filter behavior continue to work