Merge pull request #2612 from dessatel/dev-v2

Disables codecIsAdaptive for Odroid-XU4

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java

@@ -339,7 +339,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     }
     }
 
 
     String codecName = decoderInfo.name;
     String codecName = decoderInfo.name;
-    codecIsAdaptive = decoderInfo.adaptive;
+    codecIsAdaptive = decoderInfo.adaptive && (codecNeedsDisableAdaptationWorkaround(codecName)==false);
     codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
     codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
     codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
     codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
     codecNeedsAdaptationWorkaround = codecNeedsAdaptationWorkaround(codecName);
     codecNeedsAdaptationWorkaround = codecNeedsAdaptationWorkaround(codecName);
@@ -1187,5 +1187,17 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     return Util.SDK_INT <= 18 && format.channelCount == 1
     return Util.SDK_INT <= 18 && format.channelCount == 1
         && "OMX.MTK.AUDIO.DECODER.MP3".equals(name);
         && "OMX.MTK.AUDIO.DECODER.MP3".equals(name);
   }
   }
-
+  /**
+   * Returns whether the decoder is needs Apaptive workaround disabled
+   * <p>
+   * If TRUE is returned then we explicitly override codecIsAdaptive,
+   * setting it to false.
+   * @param name The decoder name.
+   * @return TRUE if the device needs Adaptive workaround disabled
+   */
+  private static boolean codecNeedsDisableAdaptationWorkaround(String name) {
+    return (
+        (Util.SDK_INT <= 19 && Util.MODEL.equals("ODROID-XU3")
+        && ("OMX.Exynos.AVC.Decoder".equals(name) || "OMX.Exynos.AVC.Decoder.secure".equals(name))));
+  }
 }
 }