Merge "SurfaceTexture: update API docs" (dbed083f) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/SurfaceTexture.cpp

+10 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ namespace android {

		static const char* const OutOfResourcesException =
		"android/graphics/SurfaceTexture$OutOfResourcesException";
		static const char* const IllegalStateException = "java/lang/IllegalStateException";
		const char* const kSurfaceTextureClassPathName = "android/graphics/SurfaceTexture";

		struct fields_t {
		@@ -212,10 +213,16 @@ static void SurfaceTexture_setDefaultBufferSize(
		surfaceTexture->setDefaultBufferSize(width, height);
		}

		static jint SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)
		static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)
		{
		sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));
		return surfaceTexture->updateTexImage();
		status_t err = surfaceTexture->updateTexImage();
		if (err == INVALID_OPERATION) {
		jniThrowException(env, IllegalStateException, "Unable to update texture contents (see "
		"logcat for details)");
		} else {
		jniThrowRuntimeException(env, "Error during updateTexImage (see logcat for details)");
		}
		}

		static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz)
		@@ -258,7 +265,7 @@ static JNINativeMethod gSurfaceTextureMethods[] = {
		{"nativeInit", "(ILjava/lang/Object;Z)V", (void*)SurfaceTexture_init },
		{"nativeFinalize", "()V", (void*)SurfaceTexture_finalize },
		{"nativeSetDefaultBufferSize", "(II)V", (void*)SurfaceTexture_setDefaultBufferSize },
		{"nativeUpdateTexImage", "()I", (void*)SurfaceTexture_updateTexImage },
		{"nativeUpdateTexImage", "()V", (void*)SurfaceTexture_updateTexImage },
		{"nativeDetachFromGLContext", "()I", (void*)SurfaceTexture_detachFromGLContext },
		{"nativeAttachToGLContext", "(I)I", (void*)SurfaceTexture_attachToGLContext },
		{"nativeGetTransformMatrix", "([F)V", (void*)SurfaceTexture_getTransformMatrix },

graphics/java/android/graphics/SurfaceTexture.java

+24 −9

Original line number	Diff line number	Diff line
		@@ -155,19 +155,23 @@ public class SurfaceTexture {

		/**
		* Update the texture image to the most recent frame from the image stream. This may only be
		* called while the OpenGL ES context that owns the texture is bound to the thread. It will
		* implicitly bind its texture to the GL_TEXTURE_EXTERNAL_OES texture target.
		* called while the OpenGL ES context that owns the texture is current on the calling thread.
		* It will implicitly bind its texture to the GL_TEXTURE_EXTERNAL_OES texture target.
		*/
		public void updateTexImage() {
		int err = nativeUpdateTexImage();
		if (err != 0) {
		throw new RuntimeException("Error during updateTexImage (see logcat for details)");
		}
		nativeUpdateTexImage();
		}

		/**
		* Detach the SurfaceTexture from the OpenGL ES context with which it is currently associated.
		* This can be used to change from one OpenGL ES context to another.
		* Detach the SurfaceTexture from the OpenGL ES context that owns the OpenGL ES texture object.
		* This call must be made with the OpenGL ES context current on the calling thread. The OpenGL
		* ES texture object will be deleted as a result of this call. After calling this method all
		* calls to {@link #updateTexImage} will throw an {@link java.lang.IllegalStateException} until
		* a successful call to {@link #attachToGLContext} is made.
		*
		* This can be used to access the SurfaceTexture image contents from multiple OpenGL ES
		* contexts. Note, however, that the image contents are only accessible from one OpenGL ES
		* context at a time.
		*
		* @hide
		*/
		@@ -179,6 +183,17 @@ public class SurfaceTexture {
		}

		/**
		* Attach the SurfaceTexture to the OpenGL ES context that is current on the calling thread. A
		* new OpenGL ES texture object is created and populated with the SurfaceTexture image frame
		* that was current at the time of the last call to {@link #detachFromGLContext}. This new
		* texture is bound to the GL_TEXTURE_EXTERNAL_OES texture target.
		*
		* This can be used to access the SurfaceTexture image contents from multiple OpenGL ES
		* contexts. Note, however, that the image contents are only accessible from one OpenGL ES
		* context at a time.
		*
		* @param texName The name of the OpenGL ES texture that will be created. This texture name
		* must be unusued in the OpenGL ES context that is current on the calling thread.
		*
		* @hide
		*/
		@@ -292,7 +307,7 @@ public class SurfaceTexture {
		private native void nativeGetTransformMatrix(float[] mtx);
		private native long nativeGetTimestamp();
		private native void nativeSetDefaultBufferSize(int width, int height);
		private native int nativeUpdateTexImage();
		private native void nativeUpdateTexImage();
		private native int nativeDetachFromGLContext();
		private native int nativeAttachToGLContext(int texName);
		private native int nativeGetQueuedCount();