Cherry pick PR youtube#2774: Delete the callback before the mMediaCod…

…ec is set to null. (youtube#2779) Refer to the original PR: youtube#2774 There is a race condition that the callback is triggered after mMediaCodec is set to null. b/331835987 Co-authored-by: Colin Liang <[email protected]>
kaidokert · Mar 29, 2024 · 24c9165 · 24c9165
1 parent ef9ccf7
commit 24c9165
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java b/starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
@@ -818,6 +818,9 @@ public static void createVideoMediaCodecBridge(
   @UsedByNative
   public void release() {
     try {
+      mMediaCodec.setCallback(null);
+      mCallback = null;
+
       String codecName = mMediaCodec.getName();
       Log.w(TAG, "calling MediaCodec.release() on " + codecName);
       mMediaCodec.release();