add tests for external textures

Author: iskakaushik

shell/platform/darwin/macos/framework/Source/FlutterEngine.mm

@@ -70,7 +70,6 @@ - (instancetype)initWithPlugin:(nonnull NSString*)pluginKey
 @implementation FlutterEngineRegistrar {
   NSString* _pluginKey;
   FlutterEngine* _flutterEngine;
-  FlutterEngineProcTable _embedderAPI;
 }
 
 - (instancetype)initWithPlugin:(NSString*)pluginKey flutterEngine:(FlutterEngine*)flutterEngine {
@@ -146,7 +145,8 @@ - (instancetype)initWithName:(NSString*)labelPrefix
   _allowHeadlessExecution = allowHeadlessExecution;
   _embedderAPI.struct_size = sizeof(FlutterEngineProcTable);
   FlutterEngineGetProcAddresses(&_embedderAPI);
-  _openGLRenderer = [[FlutterOpenGLRenderer alloc] initWithFlutterEngine:_engine];
+  _openGLRenderer = [[FlutterOpenGLRenderer alloc] initWithEmbedderEngine:_engine
+                                                            flutterEngine:self];
 
   NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
   [notificationCenter addObserver:self

shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <OCMock/OCMock.h>
+
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
@@ -50,4 +52,66 @@
   [engine shutDownEngine];
 }
 
-}  // flutter::testing
+TEST(FlutterEngine, RegisterExternalTexture) {
+  FlutterEngine* engine = CreateTestEngine();
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+
+  id<FlutterTexture> flutterTexture = OCMProtocolMock(@protocol(FlutterTexture));
+  bool called = false;
+
+  engine.embedderAPI.RegisterExternalTexture =
+      MOCK_ENGINE_PROC(RegisterExternalTexture, [&](auto engine, int64_t textureIdentifier) {
+        called = true;
+        EXPECT_EQ(textureIdentifier, reinterpret_cast<int64_t>(flutterTexture));
+        return kSuccess;
+      });
+
+  [engine.openGLRenderer registerTexture:flutterTexture];
+  EXPECT_TRUE(called);
+
+  [engine shutDownEngine];
+}
+
+TEST(FlutterEngine, UnregisterExternalTexture) {
+  FlutterEngine* engine = CreateTestEngine();
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+
+  id<FlutterTexture> flutterTexture = OCMProtocolMock(@protocol(FlutterTexture));
+  bool called = false;
+
+  int64_t registeredTextureId = [engine.openGLRenderer registerTexture:flutterTexture];
+  engine.embedderAPI.UnregisterExternalTexture =
+      MOCK_ENGINE_PROC(UnregisterExternalTexture, [&](auto engine, int64_t textureIdentifier) {
+        called = true;
+        EXPECT_EQ(textureIdentifier, registeredTextureId);
+        return kSuccess;
+      });
+
+  [engine.openGLRenderer unregisterTexture:registeredTextureId];
+  EXPECT_TRUE(called);
+
+  [engine shutDownEngine];
+}
+
+TEST(FlutterEngine, MarkExternalTextureFrameAvailable) {
+  FlutterEngine* engine = CreateTestEngine();
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+
+  id<FlutterTexture> flutterTexture = OCMProtocolMock(@protocol(FlutterTexture));
+  bool called = false;
+
+  int64_t registeredTextureId = [engine.openGLRenderer registerTexture:flutterTexture];
+  engine.embedderAPI.MarkExternalTextureFrameAvailable = MOCK_ENGINE_PROC(
+      MarkExternalTextureFrameAvailable, [&](auto engine, int64_t textureIdentifier) {
+        called = true;
+        EXPECT_EQ(textureIdentifier, registeredTextureId);
+        return kSuccess;
+      });
+
+  [engine.openGLRenderer textureFrameAvailable:registeredTextureId];
+  EXPECT_TRUE(called);
+
+  [engine shutDownEngine];
+}
+
+}  // namespace flutter::testing

shell/platform/darwin/macos/framework/Source/FlutterExternalTextureGL.mm

@@ -32,7 +32,7 @@ - (instancetype)initWithFlutterTexture:(id<FlutterTexture>)texture {
 }
 
 - (int64_t)textureID {
-  return reinterpret_cast<int64_t>(self);
+  return reinterpret_cast<int64_t>(_texture);
 }
 
 - (BOOL)populateTexture:(FlutterOpenGLTexture*)openGLTexture {

shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.h

@@ -31,7 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Intializes the renderer with the given FlutterEngine.
  */
-- (instancetype)initWithFlutterEngine:(FLUTTER_API_SYMBOL(FlutterEngine))engine;
+- (instancetype)initWithEmbedderEngine:(FLUTTER_API_SYMBOL(FlutterEngine))engine
+                         flutterEngine:(FlutterEngine*)flutterEngine;
 
 /**
  * Attaches to the FlutterView and sets up the renderers main OpenGL context.

shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.mm

@@ -59,13 +59,15 @@ @implementation FlutterOpenGLRenderer {
   // A mapping of textureID to internal FlutterExternalTextureGL adapter.
   NSMutableDictionary<NSNumber*, FlutterExternalTextureGL*>* _textures;
 
-  FlutterEngineProcTable _embedderAPI;
+  FlutterEngine* _flutterEngine;
 }
 
-- (instancetype)initWithFlutterEngine:(FLUTTER_API_SYMBOL(FlutterEngine))engine {
+- (instancetype)initWithEmbedderEngine:(FLUTTER_API_SYMBOL(FlutterEngine))engine
+                         flutterEngine:(FlutterEngine*)flutterEngine {
   self = [super init];
   if (self) {
     _engine = engine;
+    _flutterEngine = flutterEngine;
     _textures = [[NSMutableDictionary alloc] init];
   }
   return self;
@@ -141,7 +143,8 @@ - (int64_t)registerTexture:(id<FlutterTexture>)texture {
   FlutterExternalTextureGL* FlutterTexture =
       [[FlutterExternalTextureGL alloc] initWithFlutterTexture:texture];
   int64_t textureID = [FlutterTexture textureID];
-  FlutterEngineResult success = _embedderAPI.RegisterExternalTexture(_engine, textureID);
+  FlutterEngineResult success =
+      _flutterEngine.embedderAPI.RegisterExternalTexture(_engine, textureID);
   if (success == FlutterEngineResult::kSuccess) {
     _textures[@(textureID)] = FlutterTexture;
     return textureID;
@@ -152,14 +155,16 @@ - (int64_t)registerTexture:(id<FlutterTexture>)texture {
 }
 
 - (void)textureFrameAvailable:(int64_t)textureID {
-  FlutterEngineResult success = _embedderAPI.MarkExternalTextureFrameAvailable(_engine, textureID);
+  FlutterEngineResult success =
+      _flutterEngine.embedderAPI.MarkExternalTextureFrameAvailable(_engine, textureID);
   if (success != FlutterEngineResult::kSuccess) {
     NSLog(@"Unable to mark texture with id %lld as available.", textureID);
   }
 }
 
 - (void)unregisterTexture:(int64_t)textureID {
-  FlutterEngineResult success = _embedderAPI.UnregisterExternalTexture(_engine, textureID);
+  FlutterEngineResult success =
+      _flutterEngine.embedderAPI.UnregisterExternalTexture(_engine, textureID);
   if (success == FlutterEngineResult::kSuccess) {
     [_textures removeObjectForKey:@(textureID)];
   } else {