From ab3f623767525c3e0c6b555e3aa3f3fa2bfa50d2 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Fri, 7 Aug 2015 17:28:03 +0100 Subject: [PATCH] Workaround broken devices. Issue #464 Issue #665 --- .../google/android/exoplayer/MediaCodecTrackRenderer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java index f54e8947c0..e9d21df57b 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java @@ -950,8 +950,11 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer { * incorrectly on the host device. False otherwise. */ private static boolean codecNeedsEndOfStreamWorkaround(String name) { - return Util.SDK_INT <= 17 && "ht7s3".equals(Util.DEVICE) // Tesco HUDL - && "OMX.rk.video_decoder.avc".equals(name); + return Util.SDK_INT <= 17 + && "OMX.rk.video_decoder.avc".equals(name) + && ("ht7s3".equals(Util.DEVICE) // Tesco HUDL + || "rk30sdk".equals(Util.DEVICE) // Rockchip rk30 + || "rk31sdk".equals(Util.DEVICE)); // Rockchip rk31 } }