Merge pull request #2131

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=140720011

Merge pull request #2131
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=140720011
53dcb828 · olly · Oliver Woodman · f3dbb746 · 53dcb828
Commit 53dcb828 authored Dec 01, 2016 by olly Committed by Oliver Woodman Dec 01, 2016
Showing with 4 additions and 1 deletions
library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
--- 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)));
  }

  /**