Pass surface_texture to JNI methods

Emmanuel Garcia · Emmanuel Garcia · commit 19aa4e775347 · 2020-06-08T22:55:35.000-07:00
diff --git a/shell/platform/android/android_external_texture_gl.cc b/shell/platform/android/android_external_texture_gl.cc
@@ -14,10 +14,10 @@ AndroidExternalTextureGL::AndroidExternalTextureGL(
     int64_t id,
     const fml::jni::JavaObjectWeakGlobalRef& surface_texture,
     std::unique_ptr<PlatformViewAndroidJNI> jni_facade)
-    : Texture(id), surface_texture_(surface_texture), transform(SkMatrix::I()) {
-  jni_facade_ = std::unique_ptr<PlatformViewAndroidJNIImpl>(
-      static_cast<PlatformViewAndroidJNIImpl*>(jni_facade.release()));
-}
+    : Texture(id),
+      jni_facade_(std::move(jni_facade)),
+      surface_texture_(surface_texture),
+      transform(SkMatrix::I()) {}
 
 AndroidExternalTextureGL::~AndroidExternalTextureGL() {
   if (state_ == AttachmentState::attached) {
@@ -72,8 +72,7 @@ void AndroidExternalTextureGL::Paint(SkCanvas& canvas,
 }
 
 void AndroidExternalTextureGL::UpdateTransform() {
-  jni_facade_->SetCurrentSurfaceTexture(surface_texture_);
-  jni_facade_->SurfaceTextureGetTransformMatrix(transform);
+  jni_facade_->SurfaceTextureGetTransformMatrix(surface_texture_, transform);
 }
 
 void AndroidExternalTextureGL::OnGrContextDestroyed() {
@@ -84,19 +83,16 @@ void AndroidExternalTextureGL::OnGrContextDestroyed() {
 }
 
 void AndroidExternalTextureGL::Attach(jint textureName) {
-  jni_facade_->SetCurrentSurfaceTexture(surface_texture_);
-  jni_facade_->SurfaceTextureAttachToGLContext(textureName);
+  jni_facade_->SurfaceTextureAttachToGLContext(surface_texture_, textureName);
 }
 
 void AndroidExternalTextureGL::Update() {
-  jni_facade_->SetCurrentSurfaceTexture(surface_texture_);
-  jni_facade_->SurfaceTextureUpdateTexImage();
+  jni_facade_->SurfaceTextureUpdateTexImage(surface_texture_);
   UpdateTransform();
 }
 
 void AndroidExternalTextureGL::Detach() {
-  jni_facade_->SetCurrentSurfaceTexture(surface_texture_);
-  jni_facade_->SurfaceTextureDetachFromGLContext();
+  jni_facade_->SurfaceTextureDetachFromGLContext(surface_texture_);
 }
 
 void AndroidExternalTextureGL::OnTextureUnregistered() {}
diff --git a/shell/platform/android/android_external_texture_gl.h b/shell/platform/android/android_external_texture_gl.h
@@ -45,7 +45,7 @@ class AndroidExternalTextureGL : public flutter::Texture {
 
   enum class AttachmentState { uninitialized, attached, detached };
 
-  std::unique_ptr<PlatformViewAndroidJNIImpl> jni_facade_;
+  std::unique_ptr<PlatformViewAndroidJNI> jni_facade_;
 
   fml::jni::JavaObjectWeakGlobalRef surface_texture_;
 
diff --git a/shell/platform/android/jni/platform_view_android_jni.h b/shell/platform/android/jni/platform_view_android_jni.h
@@ -5,6 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
 
+#include <any>
+
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/lib/ui/window/platform_message.h"
@@ -72,25 +74,35 @@ class PlatformViewAndroidJNI {
   /// @brief      Attach the SurfaceTexture to the OpenGL ES context that is
   ///             current on the calling thread.
   ///
-  virtual void SurfaceTextureAttachToGLContext(int textureId) = 0;
+  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
+  ///
+  virtual void SurfaceTextureAttachToGLContext(std::any surface_texture,
+                                               int textureId) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Updates the texture image to the most recent frame from the
   ///             image stream.
   ///
-  virtual void SurfaceTextureUpdateTexImage() = 0;
+  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
+  ///
+  virtual void SurfaceTextureUpdateTexImage(std::any surface_texture) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Gets the transform matrix from the SurfaceTexture.
   ///             Then, it updates the `transform` matrix, so it fill the canvas
   ///             and preserve the aspect ratio.
   ///
-  virtual void SurfaceTextureGetTransformMatrix(SkMatrix& transform) = 0;
+  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
+  ///
+  virtual void SurfaceTextureGetTransformMatrix(std::any surface_texture,
+                                                SkMatrix& transform) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Detaches a SurfaceTexture from the OpenGL ES context.
   ///
-  virtual void SurfaceTextureDetachFromGLContext() = 0;
+  /// @note       `surface_texture` must be `fml::jni::JavaObjectWeakGlobalRef`
+  ///
+  virtual void SurfaceTextureDetachFromGLContext(std::any surface_texture) = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Positions and sizes a platform view if using hybrid
diff --git a/shell/platform/android/platform_view_android_jni_impl.cc b/shell/platform/android/platform_view_android_jni_impl.cc
@@ -29,6 +29,9 @@
 #define ANDROID_SHELL_HOLDER \
   (reinterpret_cast<AndroidShellHolder*>(shell_holder))
 
+#define SURFACE_TEXTURE_LOCAL_REF \
+  (std::any_cast<fml::jni::JavaObjectWeakGlobalRef>(surface_texture))
+
 namespace flutter {
 
 namespace {
@@ -886,37 +889,35 @@ void PlatformViewAndroidJNIImpl::FlutterViewOnPreEngineRestart() {
   FML_CHECK(CheckException(env));
 }
 
-void PlatformViewAndroidJNIImpl::SetCurrentSurfaceTexture(
-    fml::jni::JavaObjectWeakGlobalRef& surface_texture) {
-  surface_texture_ = surface_texture;
-}
-
 void PlatformViewAndroidJNIImpl::SurfaceTextureAttachToGLContext(
+    std::any surface_texture,
     int textureId) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
-  fml::jni::ScopedJavaLocalRef<jobject> surface_texture =
-      surface_texture_.get(env);
-  if (surface_texture.is_null()) {
+  fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
+      SURFACE_TEXTURE_LOCAL_REF.get(env);
+  if (surface_texture_local_ref.is_null()) {
     return;
   }
 
-  env->CallVoidMethod(surface_texture.obj(), g_attach_to_gl_context_method,
-                      textureId);
+  env->CallVoidMethod(surface_texture_local_ref.obj(),
+                      g_attach_to_gl_context_method, textureId);
 
   FML_CHECK(CheckException(env));
 }
 
-void PlatformViewAndroidJNIImpl::SurfaceTextureUpdateTexImage() {
+void PlatformViewAndroidJNIImpl::SurfaceTextureUpdateTexImage(
+    std::any surface_texture) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
-  fml::jni::ScopedJavaLocalRef<jobject> surface_texture =
-      surface_texture_.get(env);
-  if (surface_texture.is_null()) {
+  fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
+      SURFACE_TEXTURE_LOCAL_REF.get(env);
+  if (surface_texture_local_ref.is_null()) {
     return;
   }
 
-  env->CallVoidMethod(surface_texture.obj(), g_update_tex_image_method);
+  env->CallVoidMethod(surface_texture_local_ref.obj(),
+                      g_update_tex_image_method);
 
   FML_CHECK(CheckException(env));
 }
@@ -934,20 +935,21 @@ SkSize ScaleToFill(float scaleX, float scaleY) {
 }
 
 void PlatformViewAndroidJNIImpl::SurfaceTextureGetTransformMatrix(
+    std::any surface_texture,
     SkMatrix& transform) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
-  fml::jni::ScopedJavaLocalRef<jobject> surface_texture =
-      surface_texture_.get(env);
-  if (surface_texture.is_null()) {
+  fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
+      SURFACE_TEXTURE_LOCAL_REF.get(env);
+  if (surface_texture_local_ref.is_null()) {
     return;
   }
 
   fml::jni::ScopedJavaLocalRef<jfloatArray> transformMatrix(
       env, env->NewFloatArray(16));
 
-  env->CallVoidMethod(surface_texture.obj(), g_get_transform_matrix_method,
-                      transformMatrix.obj());
+  env->CallVoidMethod(surface_texture_local_ref.obj(),
+                      g_get_transform_matrix_method, transformMatrix.obj());
   FML_CHECK(CheckException(env));
 
   float* m = env->GetFloatArrayElements(transformMatrix.obj(), nullptr);
@@ -962,16 +964,18 @@ void PlatformViewAndroidJNIImpl::SurfaceTextureGetTransformMatrix(
   transform.set9(matrix3);
 }
 
-void PlatformViewAndroidJNIImpl::SurfaceTextureDetachFromGLContext() {
+void PlatformViewAndroidJNIImpl::SurfaceTextureDetachFromGLContext(
+    std::any surface_texture) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
-  fml::jni::ScopedJavaLocalRef<jobject> surface_texture =
-      surface_texture_.get(env);
-  if (surface_texture.is_null()) {
+  fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref =
+      SURFACE_TEXTURE_LOCAL_REF.get(env);
+  if (surface_texture_local_ref.is_null()) {
     return;
   }
 
-  env->CallVoidMethod(surface_texture.obj(), g_detach_from_gl_context_method);
+  env->CallVoidMethod(surface_texture_local_ref.obj(),
+                      g_detach_from_gl_context_method);
 
   FML_CHECK(CheckException(env));
 }
diff --git a/shell/platform/android/platform_view_android_jni_impl.h b/shell/platform/android/platform_view_android_jni_impl.h
@@ -39,16 +39,15 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
 
   void FlutterViewOnPreEngineRestart() override;
 
-  void SetCurrentSurfaceTexture(
-      fml::jni::JavaObjectWeakGlobalRef& surface_texture);
+  void SurfaceTextureAttachToGLContext(std::any surface_texture,
+                                       int textureId) override;
 
-  void SurfaceTextureAttachToGLContext(int textureId) override;
+  void SurfaceTextureUpdateTexImage(std::any surface_texture) override;
 
-  void SurfaceTextureUpdateTexImage() override;
+  void SurfaceTextureGetTransformMatrix(std::any surface_texture,
+                                        SkMatrix& transform) override;
 
-  void SurfaceTextureGetTransformMatrix(SkMatrix& transform) override;
-
-  void SurfaceTextureDetachFromGLContext() override;
+  void SurfaceTextureDetachFromGLContext(std::any surface_texture) override;
 
   void FlutterViewOnDisplayPlatformView(int view_id,
                                         int x,
