Lock the mutex in the external texture related API

* Use find instead of operator[] that can cause unintended insertion

Signed-off-by: Boram Bae <boram21.bae@samsung.com>

Author: bbrto21

shell/platform/tizen/external_texture_gl.cc

@@ -54,7 +54,6 @@ ExternalTextureGL::ExternalTextureGL()
       texture_id_(nextTextureId++) {}
 
 ExternalTextureGL::~ExternalTextureGL() {
-  mutex_.lock();
   if (state_->gl_texture != 0) {
     glDeleteTextures(1, &state_->gl_texture);
   }
@@ -65,14 +64,11 @@ ExternalTextureGL::~ExternalTextureGL() {
   }
 
   state_.release();
-  mutex_.unlock();
 }
 
 bool ExternalTextureGL::OnFrameAvailable(tbm_surface_h tbm_surface) {
-  mutex_.lock();
   if (!tbm_surface) {
     FT_LOGE("[texture id:%ld] tbm_surface is null", texture_id_);
-    mutex_.unlock();
     return false;
   }
 
@@ -81,30 +77,25 @@ bool ExternalTextureGL::OnFrameAvailable(tbm_surface_h tbm_surface) {
         "[texture id:%ld] Discard! an available tbm surface that has not yet "
         "been used exists",
         texture_id_);
-    mutex_.unlock();
     return false;
   }
 
   tbm_surface_info_s info;
   if (tbm_surface_get_info(tbm_surface, &info) != TBM_SURFACE_ERROR_NONE) {
     FT_LOGD("[texture id:%ld] tbm_surface not valid, pass", texture_id_);
-    mutex_.unlock();
     return false;
   }
 
   available_tbm_surface_ = tbm_surface;
   MarkTbmSurfaceToUse(available_tbm_surface_);
 
-  mutex_.unlock();
   return true;
 }
 
 bool ExternalTextureGL::PopulateTextureWithIdentifier(
     size_t width, size_t height, FlutterOpenGLTexture* opengl_texture) {
-  mutex_.lock();
   if (!available_tbm_surface_) {
     FT_LOGD("[texture id:%ld] available_tbm_surface_ is null", texture_id_);
-    mutex_.unlock();
     return false;
   }
   tbm_surface_info_s info;
@@ -113,7 +104,6 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
     FT_LOGD("[texture id:%ld] tbm_surface is invalid", texture_id_);
     UnmarkTbmSurfaceToUse(available_tbm_surface_);
     available_tbm_surface_ = nullptr;
-    mutex_.unlock();
     return false;
   }
 
@@ -124,7 +114,6 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
       EVAS_GL_NATIVE_SURFACE_TIZEN, (void*)(intptr_t)available_tbm_surface_,
       attribs);
   if (!egl_src_image) {
-    mutex_.unlock();
     return false;
   }
   if (state_->gl_texture == 0) {
@@ -157,7 +146,6 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
   if (!egl_src_image) {
     FT_LOGE("[texture id:%ld] egl_src_image create fail!!, errorcode == %d",
             texture_id_, eglGetError());
-    mutex_.unlock();
     return false;
   }
   if (state_->gl_texture == 0) {
@@ -196,6 +184,5 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
 
   opengl_texture->width = width;
   opengl_texture->height = height;
-  mutex_.unlock();
   return true;
 }

shell/platform/tizen/flutter_tizen.cc

@@ -181,6 +181,7 @@ void FlutterNotifyLowMemoryWarning(FlutterWindowControllerRef controller) {
 int64_t FlutterRegisterExternalTexture(
     FlutterTextureRegistrarRef texture_registrar) {
   FT_LOGD("FlutterDesktopRegisterExternalTexture");
+  std::lock_guard<std::mutex> lock(texture_registrar->mutex);
   auto texture_gl = std::make_unique<ExternalTextureGL>();
   int64_t texture_id = texture_gl->TextureId();
   texture_registrar->textures[texture_id] = std::move(texture_gl);
@@ -193,16 +194,19 @@ int64_t FlutterRegisterExternalTexture(
 
 bool FlutterUnregisterExternalTexture(
     FlutterTextureRegistrarRef texture_registrar, int64_t texture_id) {
+  std::lock_guard<std::mutex> lock(texture_registrar->mutex);
   auto it = texture_registrar->textures.find(texture_id);
   if (it != texture_registrar->textures.end())
     texture_registrar->textures.erase(it);
-  return (FlutterEngineUnregisterExternalTexture(
-              texture_registrar->flutter_engine, texture_id) == kSuccess);
+  bool ret = FlutterEngineUnregisterExternalTexture(
+                 texture_registrar->flutter_engine, texture_id) == kSuccess;
+  return ret;
 }
 
 bool FlutterMarkExternalTextureFrameAvailable(
     FlutterTextureRegistrarRef texture_registrar, int64_t texture_id,
     void* tbm_surface) {
+  std::lock_guard<std::mutex> lock(texture_registrar->mutex);
   auto it = texture_registrar->textures.find(texture_id);
   if (it == texture_registrar->textures.end()) {
     FT_LOGE("can't find texture texture_id = %" PRId64, texture_id);
@@ -213,8 +217,9 @@ bool FlutterMarkExternalTextureFrameAvailable(
     // If a texture that has not been used already exists, it can fail
     return false;
   }
-  return (FlutterEngineMarkExternalTextureFrameAvailable(
-              texture_registrar->flutter_engine, texture_id) == kSuccess);
+  bool ret = FlutterEngineMarkExternalTextureFrameAvailable(
+                 texture_registrar->flutter_engine, texture_id) == kSuccess;
+  return ret;
 }
 
 void FlutterRegisterViewFactory(

shell/platform/tizen/tizen_embedder_engine.cc

@@ -231,7 +231,7 @@ bool TizenEmbedderEngine::RunEngine(
 
   if (HasTizenRenderer()) {
     std::unique_ptr<FlutterTextureRegistrar> textures =
-    std::make_unique<FlutterTextureRegistrar>();
+        std::make_unique<FlutterTextureRegistrar>();
     textures->flutter_engine = flutter_engine;
     plugin_registrar_->texture_registrar = std::move(textures);
 
@@ -285,9 +285,16 @@ bool TizenEmbedderEngine::OnAcquireExternalTexture(
     FlutterOpenGLTexture* texture) {
   TizenEmbedderEngine* tizen_embedder_engine =
       reinterpret_cast<TizenEmbedderEngine*>(user_data);
-  return tizen_embedder_engine->plugin_registrar_->texture_registrar
-      ->textures[texture_id]
-      ->PopulateTextureWithIdentifier(width, height, texture);
+  std::lock_guard<std::mutex> lock(
+      tizen_embedder_engine->plugin_registrar_->texture_registrar->mutex);
+  auto it = tizen_embedder_engine->plugin_registrar_->texture_registrar
+                ->textures.find(texture_id);
+  int ret = false;
+  if (it != tizen_embedder_engine->plugin_registrar_->texture_registrar
+                ->textures.end()) {
+    ret = it->second->PopulateTextureWithIdentifier(width, height, texture);
+  }
+  return ret;
 }
 
 void TizenEmbedderEngine::SendWindowMetrics(int32_t width, int32_t height,

shell/platform/tizen/tizen_embedder_engine.h

@@ -60,6 +60,7 @@ struct FlutterTextureRegistrar {
 
   // The texture registrar managing external texture adapters.
   std::map<int64_t, std::unique_ptr<ExternalTextureGL>> textures;
+  std::mutex mutex;
 };
 
 using UniqueAotDataPtr = std::unique_ptr<_FlutterEngineAOTData, AOTDataDeleter>;