diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 161166a1cfa..264b31a9a9e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -2431,7 +2431,11 @@ private static boolean codecNeedsEosPropagationWorkaround(MediaCodecInfo codecIn
         || (Util.SDK_INT <= 17 && "OMX.allwinner.video.decoder.avc".equals(name))
         || (Util.SDK_INT <= 29
             && ("OMX.broadcom.video_decoder.tunnel".equals(name)
-                || "OMX.broadcom.video_decoder.tunnel.secure".equals(name)))
+                || "OMX.broadcom.video_decoder.tunnel.secure".equals(name)
+                || "OMX.bcm.vdec.avc.tunnel".equals(name)
+                || "OMX.bcm.vdec.avc.tunnel.secure".equals(name)
+                || "OMX.bcm.vdec.hevc.tunnel".equals(name)
+                || "OMX.bcm.vdec.hevc.tunnel.secure".equals(name)))
         || ("Amazon".equals(Util.MANUFACTURER) && "AFTS".equals(Util.MODEL) && codecInfo.secure);
   }