Merge "AArch64: Use long for pointers in SurfaceTexture" (887b1ca8) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/SurfaceTexture.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -55,28 +55,28 @@ static void SurfaceTexture_setSurfaceTexture(JNIEnv* env, jobject thiz,
		const sp<GLConsumer>& surfaceTexture)
		{
		GLConsumer* const p =
		(GLConsumer*)env->GetIntField(thiz, fields.surfaceTexture);
		(GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);
		if (surfaceTexture.get()) {
		surfaceTexture->incStrong((void*)SurfaceTexture_setSurfaceTexture);
		}
		if (p) {
		p->decStrong((void*)SurfaceTexture_setSurfaceTexture);
		}
		env->SetIntField(thiz, fields.surfaceTexture, (int)surfaceTexture.get());
		env->SetLongField(thiz, fields.surfaceTexture, (jlong)surfaceTexture.get());
		}

		static void SurfaceTexture_setBufferQueue(JNIEnv* env, jobject thiz,
		const sp<BufferQueue>& bq)
		{
		BufferQueue* const p =
		(BufferQueue*)env->GetIntField(thiz, fields.bufferQueue);
		(BufferQueue*)env->GetLongField(thiz, fields.bufferQueue);
		if (bq.get()) {
		bq->incStrong((void*)SurfaceTexture_setBufferQueue);
		}
		if (p) {
		p->decStrong((void*)SurfaceTexture_setBufferQueue);
		}
		env->SetIntField(thiz, fields.bufferQueue, (int)bq.get());
		env->SetLongField(thiz, fields.bufferQueue, (jlong)bq.get());
		}

		static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,
		@@ -84,22 +84,22 @@ static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,
		{
		GLConsumer::FrameAvailableListener* const p =
		(GLConsumer::FrameAvailableListener*)
		env->GetIntField(thiz, fields.frameAvailableListener);
		env->GetLongField(thiz, fields.frameAvailableListener);
		if (listener.get()) {
		listener->incStrong((void*)SurfaceTexture_setSurfaceTexture);
		}
		if (p) {
		p->decStrong((void*)SurfaceTexture_setSurfaceTexture);
		}
		env->SetIntField(thiz, fields.frameAvailableListener, (int)listener.get());
		env->SetLongField(thiz, fields.frameAvailableListener, (jlong)listener.get());
		}

		sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) {
		return (GLConsumer*)env->GetIntField(thiz, fields.surfaceTexture);
		return (GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);
		}

		sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz) {
		return (BufferQueue*)env->GetIntField(thiz, fields.bufferQueue);
		return (BufferQueue*)env->GetLongField(thiz, fields.bufferQueue);
		}

		sp<ANativeWindow> android_SurfaceTexture_getNativeWindow(JNIEnv* env, jobject thiz) {
		@@ -201,19 +201,19 @@ void JNISurfaceTextureContext::onFrameAvailable()
		static void SurfaceTexture_classInit(JNIEnv* env, jclass clazz)
		{
		fields.surfaceTexture = env->GetFieldID(clazz,
		ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I");
		ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "J");
		if (fields.surfaceTexture == NULL) {
		ALOGE("can't find android/graphics/SurfaceTexture.%s",
		ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID);
		}
		fields.bufferQueue = env->GetFieldID(clazz,
		ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID, "I");
		ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID, "J");
		if (fields.bufferQueue == NULL) {
		ALOGE("can't find android/graphics/SurfaceTexture.%s",
		ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID);
		}
		fields.frameAvailableListener = env->GetFieldID(clazz,
		ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID, "I");
		ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID, "J");
		if (fields.frameAvailableListener == NULL) {
		ALOGE("can't find android/graphics/SurfaceTexture.%s",
		ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID);

graphics/java/android/graphics/SurfaceTexture.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -69,9 +69,9 @@ public class SurfaceTexture {
		/**
		* These fields are used by native code, do not access or modify.
		*/
		private int mSurfaceTexture;
		private int mBufferQueue;
		private int mFrameAvailableListener;
		private long mSurfaceTexture;
		private long mBufferQueue;
		private long mFrameAvailableListener;

		/**
		* Callback interface for being notified that a new stream frame is available.