Introduce SurfaceTextureListener (38baa6a2) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ cc_library_shared {
		static_libs: [
		"libnativehelper_lazy",
		"libziparchive_for_incfs",
		"libguiflags",
		],

		export_include_dirs: [

core/jni/android_graphics_SurfaceTexture.cpp

+76 −60

Original line number	Diff line number	Diff line
		@@ -17,27 +17,25 @@
		#undef LOG_TAG
		#define LOG_TAG "SurfaceTexture"

		#include <stdio.h>

		#include <EGL/egl.h>
		#include <EGL/eglext.h>
		#include <GLES2/gl2.h>
		#include <GLES2/gl2ext.h>

		#include <com_android_graphics_libgui_flags.h>
		#include <cutils/atomic.h>
		#include <gui/BufferQueue.h>
		#include <gui/Flags.h>
		#include <gui/Surface.h>
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedLocalRef.h>
		#include <stdio.h>
		#include <surfacetexture/SurfaceTexture.h>
		#include <surfacetexture/surface_texture_platform.h>

		#include "core_jni_helpers.h"

		#include <cutils/atomic.h>
		#include <utils/Log.h>
		#include <utils/misc.h>

		#include "core_jni_helpers.h"
		#include "jni.h"
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedLocalRef.h>

		// ----------------------------------------------------------------------------

		@@ -139,31 +137,35 @@ bool android_SurfaceTexture_isInstanceOf(JNIEnv* env, jobject thiz) {

		// ----------------------------------------------------------------------------

		class JNISurfaceTextureContext : public SurfaceTexture::FrameAvailableListener
		{
		class JNISurfaceTextureContextCommon {
		public:
		JNISurfaceTextureContext(JNIEnv* env, jobject weakThiz, jclass clazz);
		virtual ~JNISurfaceTextureContext();
		virtual void onFrameAvailable(const BufferItem& item);

		private:
		static JNIEnv* getJNIEnv();
		JNISurfaceTextureContextCommon(JNIEnv* env, jobject weakThiz, jclass clazz)
		: mWeakThiz(env->NewGlobalRef(weakThiz)), mClazz((jclass)env->NewGlobalRef(clazz)) {}

		jobject mWeakThiz;
		jclass mClazz;
		};
		virtual ~JNISurfaceTextureContextCommon() {
		JNIEnv* env = getJNIEnv();
		if (env != NULL) {
		env->DeleteGlobalRef(mWeakThiz);
		env->DeleteGlobalRef(mClazz);
		} else {
		ALOGW("leaking JNI object references");
		}
		}

		JNISurfaceTextureContext::JNISurfaceTextureContext(JNIEnv* env,
		jobject weakThiz, jclass clazz) :
		mWeakThiz(env->NewGlobalRef(weakThiz)),
		mClazz((jclass)env->NewGlobalRef(clazz))
		{}
		void onFrameAvailable(const BufferItem& item) {
		JNIEnv* env = getJNIEnv();
		if (env != NULL) {
		env->CallStaticVoidMethod(mClazz, fields.postEvent, mWeakThiz);
		} else {
		ALOGW("onFrameAvailable event will not posted");
		}
		}

		JNIEnv* JNISurfaceTextureContext::getJNIEnv() {
		protected:
		static JNIEnv* getJNIEnv() {
		JNIEnv* env = AndroidRuntime::getJNIEnv();
		if (env == NULL) {
		JavaVMAttachArgs args = {
		JNI_VERSION_1_4, "JNISurfaceTextureContext", NULL };
		JavaVMAttachArgs args = {JNI_VERSION_1_4, "JNISurfaceTextureContext", NULL};
		JavaVM* vm = AndroidRuntime::getJavaVM();
		int result = vm->AttachCurrentThreadAsDaemon(&env, (void*)&args);
		if (result != JNI_OK) {
		@@ -174,26 +176,30 @@ JNIEnv* JNISurfaceTextureContext::getJNIEnv() {
		return env;
		}

		JNISurfaceTextureContext::~JNISurfaceTextureContext()
		{
		JNIEnv* env = getJNIEnv();
		if (env != NULL) {
		env->DeleteGlobalRef(mWeakThiz);
		env->DeleteGlobalRef(mClazz);
		} else {
		ALOGW("leaking JNI object references");
		}
		}
		jobject mWeakThiz;
		jclass mClazz;
		};

		void JNISurfaceTextureContext::onFrameAvailable(const BufferItem& /* item */)
		{
		JNIEnv* env = getJNIEnv();
		if (env != NULL) {
		env->CallStaticVoidMethod(mClazz, fields.postEvent, mWeakThiz);
		} else {
		ALOGW("onFrameAvailable event will not posted");
		class JNISurfaceTextureContextFrameAvailableListener
		: public JNISurfaceTextureContextCommon,
		public SurfaceTexture::FrameAvailableListener {
		public:
		JNISurfaceTextureContextFrameAvailableListener(JNIEnv* env, jobject weakThiz, jclass clazz)
		: JNISurfaceTextureContextCommon(env, weakThiz, clazz) {}
		void onFrameAvailable(const BufferItem& item) override {
		JNISurfaceTextureContextCommon::onFrameAvailable(item);
		}
		};

		class JNISurfaceTextureContextListener : public JNISurfaceTextureContextCommon,
		public SurfaceTexture::SurfaceTextureListener {
		public:
		JNISurfaceTextureContextListener(JNIEnv* env, jobject weakThiz, jclass clazz)
		: JNISurfaceTextureContextCommon(env, weakThiz, clazz) {}
		void onFrameAvailable(const BufferItem& item) override {
		JNISurfaceTextureContextCommon::onFrameAvailable(item);
		}
		};

		// ----------------------------------------------------------------------------

		@@ -274,17 +280,27 @@ static void SurfaceTexture_init(JNIEnv* env, jobject thiz, jboolean isDetached,
		return;
		}

		sp<JNISurfaceTextureContext> ctx(new JNISurfaceTextureContext(env, weakThiz,
		clazz));
		if (com::android::graphics::libgui::flags::bq_setframerate()) {
		sp<JNISurfaceTextureContextListener> ctx(
		new JNISurfaceTextureContextListener(env, weakThiz, clazz));
		surfaceTexture->setSurfaceTextureListener(ctx);
		} else {
		sp<JNISurfaceTextureContextFrameAvailableListener> ctx(
		new JNISurfaceTextureContextFrameAvailableListener(env, weakThiz, clazz));
		surfaceTexture->setFrameAvailableListener(ctx);
		SurfaceTexture_setFrameAvailableListener(env, thiz, ctx);
		}
		}

		static void SurfaceTexture_finalize(JNIEnv* env, jobject thiz)
		{
		sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));
		if (com::android::graphics::libgui::flags::bq_setframerate()) {
		surfaceTexture->setSurfaceTextureListener(0);
		} else {
		surfaceTexture->setFrameAvailableListener(0);
		SurfaceTexture_setFrameAvailableListener(env, thiz, 0);
		}
		SurfaceTexture_setSurfaceTexture(env, thiz, 0);
		SurfaceTexture_setProducer(env, thiz, 0);
		}