| commit | 796be66410d3dc763940ecf181ac91c011cc5427 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Dec 02 18:25:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 02 18:25:51 2021 +0000 |
| tree | 513b1401f60a3e260b70766db65fcca4a2213a67 | |
| parent | a27ecd6ac75f1cbb7812de7be04f24e32e5ae617 [diff] | |
| parent | d331dc3a64dff61f19ab64d7f5c5784ad8f20698 [diff] |
Merge "Duration field is 64 bits" am: 2144f9bd55 am: 5fe851abe9 am: d331dc3a64 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1876176 Change-Id: I7677af171a2b22a3be2ea6b7a02dfd31b4c28f5a
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