diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-03 23:27:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 23:27:55 +0000 |
| commit | 3f514b5230d22e07ec434dbfcc512a97343a3a74 (patch) | |
| tree | c9a4afb84b7d8275bd5102472d5c4705461fef29 /core/java/android/hardware/camera2 | |
| parent | a1852f6ec8d50ae137492e91d50defd63e91ca48 (diff) | |
| parent | d8e6a8b7643ffa037fbd0e409674c450f0296809 (diff) | |
| download | frameworks_base-3f514b5230d22e07ec434dbfcc512a97343a3a74.zip frameworks_base-3f514b5230d22e07ec434dbfcc512a97343a3a74.tar.gz frameworks_base-3f514b5230d22e07ec434dbfcc512a97343a3a74.tar.bz2 | |
am d8e6a8b7: am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
* commit 'd8e6a8b7643ffa037fbd0e409674c450f0296809':
camera2: limit flexYUV array size in DngCreator
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/DngCreator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java index 6fc99ac..33d539c 100644 --- a/core/java/android/hardware/camera2/DngCreator.java +++ b/core/java/android/hardware/camera2/DngCreator.java @@ -530,9 +530,9 @@ public final class DngCreator implements AutoCloseable { int uPixStride = uPlane.getPixelStride(); byte[] yuvPixel = { 0, 0, 0 }; - byte[] yFullRow = new byte[yPixStride * width]; - byte[] uFullRow = new byte[uPixStride * width / 2]; - byte[] vFullRow = new byte[vPixStride * width / 2]; + byte[] yFullRow = new byte[yPixStride * (width - 1) + 1]; + byte[] uFullRow = new byte[uPixStride * (width / 2 - 1) + 1]; + byte[] vFullRow = new byte[vPixStride * (width / 2 - 1) + 1]; byte[] finalRow = new byte[BYTES_PER_RGB_PIX * width]; for (int i = 0; i < height; i++) { int halfH = i / 2; |