From 53dcb82862e406d571c8a07c2db99419a7733655 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 1 Dec 2016 05:28:35 -0800 Subject: [PATCH] Merge pull request #2131 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=140720011 --- .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 440451c183..7c342f8191 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -1071,7 +1071,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer { * buffer with {@link MediaCodec#BUFFER_FLAG_END_OF_STREAM} set. False otherwise. */ private static boolean codecNeedsEosFlushWorkaround(String name) { - return Util.SDK_INT <= 23 && "OMX.google.vorbis.decoder".equals(name); + return (Util.SDK_INT <= 23 && "OMX.google.vorbis.decoder".equals(name)) + || (Util.SDK_INT <= 19 && "hb2000".equals(Util.DEVICE) + && ("OMX.amlogic.avc.decoder.awesome".equals(name) + || "OMX.amlogic.avc.decoder.awesome.secure".equals(name))); } /**