Merge "ImageReader: Implementation of ImageReader and Image APIs" (89dc02a9) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −15

Original line number	Diff line number	Diff line
		@@ -11817,26 +11817,24 @@ package android.media {
		field public static final int EULER_Z = 2; // 0x2
		}

		public abstract class Image implements java.lang.AutoCloseable {
		ctor public Image();
		public abstract interface Image implements java.lang.AutoCloseable {
		method public abstract void close();
		method protected final void finalize();
		method public int getFormat();
		method public int getHeight();
		method public android.media.Image.Plane[] getPlanes();
		method public long getTimestamp();
		method public int getWidth();
		method public abstract int getFormat();
		method public abstract int getHeight();
		method public abstract android.media.Image.Plane[] getPlanes();
		method public abstract long getTimestamp();
		method public abstract int getWidth();
		}

		public static final class Image.Plane {
		ctor public Image.Plane();
		method public java.nio.ByteBuffer getBuffer();
		method public int getPixelStride();
		method public int getRowStride();
		public static abstract interface Image.Plane {
		method public abstract java.nio.ByteBuffer getBuffer();
		method public abstract int getPixelStride();
		method public abstract int getRowStride();
		}

		public final class ImageReader {
		public final class ImageReader implements java.lang.AutoCloseable {
		ctor public ImageReader(int, int, int, int);
		method public void close();
		method public int getHeight();
		method public int getImageFormat();
		method public int getMaxImages();
		@@ -11844,7 +11842,7 @@ package android.media {
		method public android.view.Surface getSurface();
		method public int getWidth();
		method public void releaseImage(android.media.Image);
		method public void setOnImageAvailableListener(android.media.ImageReader.OnImageAvailableListener);
		method public void setImageAvailableListener(android.media.ImageReader.OnImageAvailableListener, android.os.Handler);
		}

		public static abstract interface ImageReader.OnImageAvailableListener {

media/java/android/media/Image.java

+11 −33

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import java.lang.AutoCloseable;
		*
		* @see ImageReader
		*/
		public abstract class Image implements AutoCloseable {
		public interface Image extends AutoCloseable {
		/**
		* Get the format for this image. This format determines the number of
		* ByteBuffers needed to represent the image, and the general layout of the
		@@ -87,25 +87,19 @@ public abstract class Image implements AutoCloseable {
		*
		* @see android.graphics.ImageFormat
		*/
		public int getFormat() {
		return ImageFormat.UNKNOWN;
		}
		public int getFormat();

		/**
		* The width of the image in pixels. For formats where some color channels
		* are subsampled, this is the width of the largest-resolution plane.
		*/
		public int getWidth() {
		return 0;
		}
		public int getWidth();

		/**
		* The height of the image in pixels. For formats where some color channels
		* are subsampled, this is the height of the largest-resolution plane.
		*/
		public int getHeight() {
		return 0;
		}
		public int getHeight();

		/**
		* Get the timestamp associated with this frame. The timestamp is measured
		@@ -113,17 +107,13 @@ public abstract class Image implements AutoCloseable {
		* and whether the timestamp can be compared against other sources of time
		* or images depend on the source of this image.
		*/
		public long getTimestamp() {
		return 0;
		}
		public long getTimestamp();

		/**
		* Get the array of pixel planes for this Image. The number of planes is
		* determined by the format of the Image.
		*/
		public Plane[] getPlanes() {
		return null;
		}
		public Plane[] getPlanes();

		/**
		* Free up this frame for reuse. After calling this method, calling any
		@@ -131,11 +121,7 @@ public abstract class Image implements AutoCloseable {
		* attempting to read from ByteBuffers returned by an earlier
		* {@code Plane#getBuffer} call will have undefined behavior.
		*/
		public abstract void close();

		protected final void finalize() {
		close();
		}
		public void close();

		/**
		* <p>A single color plane of image data.</p>
		@@ -148,17 +134,14 @@ public abstract class Image implements AutoCloseable {
		*
		* @see #getFormat
		*/
		public static final class Plane {
		public interface Plane {
		/**
		* <p>The row stride for this color plane, in bytes.
		*
		* <p>This is the distance between the start of two consecutive rows of
		* pixels in the image.</p>
		*/
		public int getRowStride() {
		return 0;
		}

		public int getRowStride();
		/**
		* <p>The distance between adjacent pixel samples, in bytes.</p>
		*
		@@ -166,19 +149,14 @@ public abstract class Image implements AutoCloseable {
		* of pixels. It may be larger than the size of a single pixel to
		* account for interleaved image data or padded formats.</p>
		*/
		public int getPixelStride() {
		return 0;
		}

		public int getPixelStride();
		/**
		* <p>Get a set of direct {@link java.nio.ByteBuffer byte buffers}
		* containing the frame data.</p>
		*
		* @return the byte buffer containing the image data for this plane.
		*/
		public ByteBuffer getBuffer() {
		return null;
		}
		public ByteBuffer getBuffer();
		}

		}

media/java/android/media/ImageReader.java

+301 −8

Original line number	Diff line number	Diff line
		@@ -16,8 +16,15 @@

		package android.media;

		import android.graphics.ImageFormat;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.view.Surface;
		import java.lang.AutoCloseable;

		import java.lang.ref.WeakReference;
		import java.nio.ByteBuffer;
		import java.nio.ByteOrder;

		/**
		* <p>The ImageReader class allows direct application access to image data
		@@ -39,7 +46,7 @@ import java.lang.AutoCloseable;
		* ImageReader does not obtain and release Images at a rate equal to the
		* production rate.</p>
		*/
		public final class ImageReader {
		public final class ImageReader implements AutoCloseable {

		/**
		* <p>Create a new reader for images of the desired size and format.</p>
		@@ -62,7 +69,7 @@ public final class ImageReader {
		* access simultaneously. This should be as small as possible to limit
		* memory use. Once maxImages Images are obtained by the user, one of them
		* has to be released before a new Image will become available for access
		* through getImage(). Must be greater than 0.
		* through getNextImage(). Must be greater than 0.
		*
		* @see Image
		*/
		@@ -80,6 +87,12 @@ public final class ImageReader {
		throw new IllegalArgumentException(
		"Maximum outstanding image count must be at least 1");
		}

		mNumPlanes = getNumPlanesFromFormat();

		nativeInit(new WeakReference<ImageReader>(this), width, height, format, maxImages);

		mSurface = nativeGetSurface();
		}

		public int getWidth() {
		@@ -111,7 +124,7 @@ public final class ImageReader {
		* @return A Surface to use for a drawing target for various APIs.
		*/
		public Surface getSurface() {
		return null;
		return mSurface;
		}

		/**
		@@ -122,6 +135,13 @@ public final class ImageReader {
		* available.
		*/
		public Image getNextImage() {
		SurfaceImage si = new SurfaceImage();
		if (nativeImageSetup(si)) {
		// create SurfacePlane objects
		si.createSurfacePlanes();
		si.setImageValid(true);
		return si;
		}
		return null;
		}

		@@ -138,34 +158,307 @@ public final class ImageReader {
		throw new IllegalArgumentException(
		"This image was not produced by this ImageReader");
		}

		si.clearSurfacePlanes();
		nativeReleaseImage(i);
		si.setImageValid(false);
		}

		public void setOnImageAvailableListener(OnImageAvailableListener l) {
		mImageListener = l;
		/**
		* Register a listener to be invoked when a new image becomes available
		* from the ImageReader.
		* @param listener the listener that will be run
		* @param handler The handler on which the listener should be invoked, or null
		* if the listener should be invoked on the calling thread's looper.
		*/
		public void setImageAvailableListener(OnImageAvailableListener listener, Handler handler) {
		mImageListener = listener;

		Looper looper;
		mHandler = handler;
		if (mHandler == null) {
		if ((looper = Looper.myLooper()) != null) {
		mHandler = new Handler();
		} else {
		throw new IllegalArgumentException(
		"Looper doesn't exist in the calling thread");
		}
		}
		}

		/**
		* Callback interface for being notified that a new image is available.
		* The onImageAvailable is called per image basis, that is, callback fires for every new frame
		* available from ImageReader.
		*/
		public interface OnImageAvailableListener {
		/**
		* Callback that is called when a new image is available from ImageReader.
		* @param reader the ImageReader the callback is associated with.
		* @see ImageReader
		* @see Image
		*/
		void onImageAvailable(ImageReader reader);
		}

		/**
		* Free up all the resources associated with this ImageReader. After
		* Calling this method, this ImageReader can not be used. calling
		* any methods on this ImageReader and Images previously provided by {@link #getNextImage}
		* will result in an IllegalStateException, and attempting to read from
		* ByteBuffers returned by an earlier {@code Plane#getBuffer} call will
		* have undefined behavior.
		*/
		@Override
		public void close() {
		nativeClose();
		}

		@Override
		protected void finalize() throws Throwable {
		try {
		close();
		} finally {
		super.finalize();
		}
		}

		private int getNumPlanesFromFormat() {
		switch (mFormat) {
		case ImageFormat.YV12:
		case ImageFormat.YUV_420_888:
		case ImageFormat.NV21:
		return 3;
		case ImageFormat.NV16:
		return 2;
		case ImageFormat.RGB_565:
		case ImageFormat.JPEG:
		case ImageFormat.YUY2:
		case ImageFormat.Y8:
		case ImageFormat.Y16:
		case ImageFormat.RAW_SENSOR:
		return 1;
		default:
		throw new UnsupportedOperationException(
		String.format("Invalid format specified %d", mFormat));
		}
		}

		/**
		* Called from Native code when an Event happens.
		*/
		private static void postEventFromNative(Object selfRef) {
		WeakReference weakSelf = (WeakReference)selfRef;
		final ImageReader ir = (ImageReader)weakSelf.get();
		if (ir == null) {
		return;
		}

		if (ir.mHandler != null) {
		ir.mHandler.post(new Runnable() {
		@Override
		public void run() {
		ir.mImageListener.onImageAvailable(ir);
		}
		});
		}
		}

		private final int mWidth;
		private final int mHeight;
		private final int mFormat;
		private final int mMaxImages;
		private final int mNumPlanes;
		private final Surface mSurface;

		private Handler mHandler;
		private OnImageAvailableListener mImageListener;

		private class SurfaceImage extends android.media.Image {
		/**
		* This field is used by native code, do not access or modify.
		*/
		private long mNativeContext;

		private class SurfaceImage implements android.media.Image {
		public SurfaceImage() {
		mIsImageValid = false;
		}

		@Override
		public void close() {
		if (mIsImageValid) {
		ImageReader.this.releaseImage(this);
		}
		}

		public ImageReader getReader() {
		return ImageReader.this;
		}

		@Override
		public int getFormat() {
		if (mIsImageValid) {
		return ImageReader.this.mFormat;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		public int getWidth() {
		if (mIsImageValid) {
		return ImageReader.this.mWidth;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		public int getHeight() {
		if (mIsImageValid) {
		return ImageReader.this.mHeight;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		public long getTimestamp() {
		if (mIsImageValid) {
		return mTimestamp;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		public Plane[] getPlanes() {
		if (mIsImageValid) {
		// Shallow copy is fine.
		return mPlanes.clone();
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		protected final void finalize() throws Throwable {
		try {
		close();
		} finally {
		super.finalize();
		}
		}

		private void setImageValid(boolean isValid) {
		mIsImageValid = isValid;
		}

		private boolean isImageValid() {
		return mIsImageValid;
		}

		private void clearSurfacePlanes() {
		if (mIsImageValid) {
		for (int i = 0; i < mPlanes.length; i++) {
		if (mPlanes[i] != null) {
		mPlanes[i].clearBuffer();
		mPlanes[i] = null;
		}
		}
		}
		}

		private void createSurfacePlanes() {
		mPlanes = new SurfacePlane[ImageReader.this.mNumPlanes];
		for (int i = 0; i < ImageReader.this.mNumPlanes; i++) {
		mPlanes[i] = nativeCreatePlane(i);
		}
		}
		private class SurfacePlane implements android.media.Image.Plane {
		// SurfacePlane instance is created by native code when a new SurfaceImage is created
		private SurfacePlane(int index, int rowStride, int pixelStride) {
		mIndex = index;
		mRowStride = rowStride;
		mPixelStride = pixelStride;
		}

		@Override
		public ByteBuffer getBuffer() {
		if (SurfaceImage.this.isImageValid() == false) {
		throw new IllegalStateException("Image is already released");
		}
		if (mBuffer != null) {
		return mBuffer;
		} else {
		mBuffer = SurfaceImage.this.nativeImageGetBuffer(mIndex);
		// Set the byteBuffer order according to host endianness (native order),
		// otherwise, the byteBuffer order defaults to ByteOrder.BIG_ENDIAN.
		return mBuffer.order(ByteOrder.nativeOrder());
		}
		}

		@Override
		public int getPixelStride() {
		if (SurfaceImage.this.isImageValid()) {
		return mPixelStride;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		@Override
		public int getRowStride() {
		if (SurfaceImage.this.isImageValid()) {
		return mRowStride;
		} else {
		throw new IllegalStateException("Image is already released");
		}
		}

		private void clearBuffer() {
		mBuffer = null;
		}

		final private int mIndex;
		final private int mPixelStride;
		final private int mRowStride;

		private ByteBuffer mBuffer;
		}

		/**
		* This field is used to keep track of native object and used by native code only.
		* Don't modify.
		*/
		private long mLockedBuffer;

		/**
		* This field is set by native code during nativeImageSetup().
		*/
		private long mTimestamp;

		private SurfacePlane[] mPlanes;
		private boolean mIsImageValid;

		private synchronized native ByteBuffer nativeImageGetBuffer(int idx);
		private synchronized native SurfacePlane nativeCreatePlane(int idx);
		}

		private synchronized native void nativeInit(Object weakSelf, int w, int h,
		int fmt, int maxImgs);
		private synchronized native void nativeClose();
		private synchronized native void nativeReleaseImage(Image i);
		private synchronized native Surface nativeGetSurface();
		private synchronized native boolean nativeImageSetup(Image i);

		/*
		* We use a class initializer to allow the native code to cache some
		* field offsets.
		*/
		private static native void nativeClassInit();
		static {
		System.loadLibrary("media_jni");
		nativeClassInit();
		}
		}

media/jni/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		android_media_ImageReader.cpp \
		android_media_MediaCrypto.cpp \
		android_media_MediaCodec.cpp \
		android_media_MediaCodecList.cpp \

media/jni/android_media_ImageReader.cpp

0 → 100644

+747 −0

File added.

Preview size limit exceeded, changes collapsed.