From 61718054d19f1cabba15ff4929addd3bb01fb774 Mon Sep 17 00:00:00 2001
From: Jason Zhang <jasonzh@google.com>
Date: Fri, 24 Jul 2026 15:59:51 -0700
Subject: [PATCH] android: only ignore output callbacks during
 MediaCodec.flush()

Bug: 497004556
---
 .../src/main/java/dev/cobalt/media/MediaCodecBridge.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cobalt/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java b/cobalt/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
index 735c7c971b55..5155d1823ae8 100644
--- a/cobalt/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
+++ b/cobalt/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java
@@ -312,7 +312,7 @@ public void onError(MediaCodec codec, MediaCodec.CodecException e) {
           @Override
           public void onInputBufferAvailable(MediaCodec codec, int index) {
             synchronized (mNativeBridgeLock) {
-              if (mNativeMediaCodecBridge == 0 || mIsFlushing) {
+              if (mNativeMediaCodecBridge == 0) {
                 return;
               }
               MediaCodecBridgeJni.get()
@@ -346,7 +346,7 @@ public void onOutputBufferAvailable(
           @Override
           public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
             synchronized (mNativeBridgeLock) {
-              if (mNativeMediaCodecBridge == 0 || mIsFlushing) {
+              if (mNativeMediaCodecBridge == 0) {
                 return;
               }
               mActiveFormat = new MediaFormatWrapper(format);
@@ -370,7 +370,7 @@ public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
             @Override
             public void onFrameRendered(MediaCodec codec, long presentationTimeUs, long nanoTime) {
               synchronized (mNativeBridgeLock) {
-                if (mNativeMediaCodecBridge == 0 || mIsFlushing) {
+                if (mNativeMediaCodecBridge == 0) {
                   return;
                 }
                 MediaCodecBridgeJni.get()
@@ -1082,7 +1082,7 @@ private void setupTunnelingPlayback() {
             @Override
             public void onFirstTunnelFrameReady(MediaCodec codec) {
               synchronized (mNativeBridgeLock) {
-                if (mNativeMediaCodecBridge == 0 || mIsFlushing) {
+                if (mNativeMediaCodecBridge == 0) {
                   return;
                 }
                 MediaCodecBridgeJni.get()