From eca3edb9404f794dca2b9a3b0c7572fff434dc71 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 25 Jul 2016 06:55:45 -0700 Subject: [PATCH] Small cleanup of Util constants. - Remove null checks (never happens). - Use "const".equals(Util.CONST) where possible. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=128351654 --- .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 4 ++-- .../android/exoplayer2/mediacodec/MediaCodecUtil.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 fbd3883071..a66f207b4e 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 @@ -1018,8 +1018,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer { private static boolean codecNeedsAdaptationWorkaround(String name) { return Util.SDK_INT < 24 && ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name)) - && (Util.DEVICE.equals("flounder") || Util.DEVICE.equals("flounder_lte") - || Util.DEVICE.equals("grouper") || Util.DEVICE.equals("tilapia")); + && ("flounder".equals(Util.DEVICE) || "flounder_lte".equals(Util.DEVICE) + || "grouper".equals(Util.DEVICE) || "tilapia".equals(Util.DEVICE)); } /** diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index 639905ca3c..23090abd71 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -258,14 +258,14 @@ public final class MediaCodecUtil { // Work around https://github.com/google/ExoPlayer/issues/548 // VP8 decoder on Samsung Galaxy S3/S4/S4 Mini/Tab 3 does not render video. - if (Util.SDK_INT <= 19 && Util.DEVICE != null + if (Util.SDK_INT <= 19 && (Util.DEVICE.startsWith("d2") || Util.DEVICE.startsWith("serrano") || Util.DEVICE.startsWith("jflte") || Util.DEVICE.startsWith("santos")) - && "samsung".equals(Util.MANUFACTURER) && name.equals("OMX.SEC.vp8.dec")) { + && "samsung".equals(Util.MANUFACTURER) && "OMX.SEC.vp8.dec".equals(name)) { return false; } // VP8 decoder on Samsung Galaxy S4 cannot be queried. - if (Util.SDK_INT <= 19 && Util.DEVICE != null && Util.DEVICE.startsWith("jflte") + if (Util.SDK_INT <= 19 && Util.DEVICE.startsWith("jflte") && "OMX.qcom.video.decoder.vp8".equals(name)) { return false; }