From 085840388bbebd322889026fae235b3120a4bce7 Mon Sep 17 00:00:00 2001
From: MediaPipe Team <mediapipe-team@google.com>
Date: Tue, 18 Jul 2023 23:39:57 -0700
Subject: [PATCH] Move waitOnCpu and waitOnGpu out of the synchronized block,
 which can cause deadlock.

PiperOrigin-RevId: 549217916
---
 .../mediapipe/framework/AppTextureFrame.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mediapipe/java/com/google/mediapipe/framework/AppTextureFrame.java b/mediapipe/java/com/google/mediapipe/framework/AppTextureFrame.java
index 20c63c069..242cd616a 100644
--- a/mediapipe/java/com/google/mediapipe/framework/AppTextureFrame.java
+++ b/mediapipe/java/com/google/mediapipe/framework/AppTextureFrame.java
@@ -78,17 +78,21 @@ public class AppTextureFrame implements TextureFrame {
    * Use {@link waitUntilReleasedWithGpuSync} whenever possible.
    */
   public void waitUntilReleased() throws InterruptedException {
+    GlSyncToken tokenToRelease = null;
     synchronized (this) {
       while (inUse && releaseSyncToken == null) {
         wait();
       }
       if (releaseSyncToken != null) {
-        releaseSyncToken.waitOnCpu();
-        releaseSyncToken.release();
+        tokenToRelease = releaseSyncToken;
         inUse = false;
         releaseSyncToken = null;
       }
     }
+    if (tokenToRelease != null) {
+      tokenToRelease.waitOnCpu();
+      tokenToRelease.release();
+    }
   }
 
   /**
@@ -98,17 +102,21 @@ public class AppTextureFrame implements TextureFrame {
    * TextureFrame.
    */
   public void waitUntilReleasedWithGpuSync() throws InterruptedException {
+    GlSyncToken tokenToRelease = null;
     synchronized (this) {
       while (inUse && releaseSyncToken == null) {
         wait();
       }
       if (releaseSyncToken != null) {
-        releaseSyncToken.waitOnGpu();
-        releaseSyncToken.release();
+        tokenToRelease = releaseSyncToken;
         inUse = false;
         releaseSyncToken = null;
       }
     }
+    if (tokenToRelease != null) {
+      tokenToRelease.waitOnGpu();
+      tokenToRelease.release();
+    }
   }
 
   /**