diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 2d74dfba9e..41e3c970c4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1076,7 +1076,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     // https://github.com/google/ExoPlayer/issues/3439.
     return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
         && "OMX.qcom.video.decoder.avc".equals(name))
-        || (("tcl_eu".equals(Util.DEVICE) || Util.MODEL.startsWith("BRAVIA"))
+        || (("tcl_eu".equals(Util.DEVICE) || "SVP-DTV15".equals(Util.DEVICE)
+        || "BRAVIA_ATV2".equals(Util.DEVICE))
         && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
   }