diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-03 23:21:57 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-03 23:21:57 -0400 |
commit | 4d01eeaffaa720e4458a118baa137a11614f00f7 (patch) | |
tree | 66751893566986236788e3c796a7cc5e90d05f52 /android/media/ImageReader.java | |
parent | a192cc2a132cb0ee8588e2df755563ec7008c179 (diff) | |
download | android-28-4d01eeaffaa720e4458a118baa137a11614f00f7.tar.gz |
Import Android SDK Platform P [4697573]
/google/data/ro/projects/android/fetch_artifact \
--bid 4697573 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4697573.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: If80578c3c657366cc9cf75f8db13d46e2dd4e077
Diffstat (limited to 'android/media/ImageReader.java')
-rw-r--r-- | android/media/ImageReader.java | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/android/media/ImageReader.java b/android/media/ImageReader.java index 10195805..72d52d3d 100644 --- a/android/media/ImageReader.java +++ b/android/media/ImageReader.java @@ -727,18 +727,7 @@ public class ImageReader implements AutoCloseable { return false; } - if (format == ImageFormat.PRIVATE) { - // Usage need to be either USAGE0_GPU_SAMPLED_IMAGE or USAGE0_VIDEO_ENCODE or combined. - boolean isAllowed = (usage == HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE); - isAllowed = isAllowed || (usage == HardwareBuffer.USAGE_VIDEO_ENCODE); - isAllowed = isAllowed || (usage == - (HardwareBuffer.USAGE_VIDEO_ENCODE | HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE)); - return isAllowed; - } else { - // Usage need to make the buffer CPU readable for explicit format. - return ((usage == HardwareBuffer.USAGE_CPU_READ_RARELY) || - (usage == HardwareBuffer.USAGE_CPU_READ_OFTEN)); - } + return true; } /** @@ -876,6 +865,18 @@ public class ImageReader implements AutoCloseable { } @Override + public int getTransform() { + throwISEIfImageIsInvalid(); + return mTransform; + } + + @Override + public HardwareBuffer getHardwareBuffer() { + throwISEIfImageIsInvalid(); + return nativeGetHardwareBuffer(); + } + + @Override public void setTimestamp(long timestampNs) { throwISEIfImageIsInvalid(); mTimestamp = timestampNs; @@ -1007,6 +1008,11 @@ public class ImageReader implements AutoCloseable { */ private long mTimestamp; + /** + * This field is set by native code during nativeImageSetup(). + */ + private int mTransform; + private SurfacePlane[] mPlanes; private int mFormat = ImageFormat.UNKNOWN; // If this image is detached from the ImageReader. @@ -1017,6 +1023,7 @@ public class ImageReader implements AutoCloseable { private synchronized native int nativeGetWidth(); private synchronized native int nativeGetHeight(); private synchronized native int nativeGetFormat(int readerFormat); + private synchronized native HardwareBuffer nativeGetHardwareBuffer(); } private synchronized native void nativeInit(Object weakSelf, int w, int h, |