From 5e1b430839bb38f7795d78915e0e42cdb0f2614d Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 17 May 2018 02:04:36 -0700 Subject: [PATCH] Fix check for missing profile/level SparseIntArray.get(key) defaults to zero for missing keys (the null check was left over from when a Map was used). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=196957452 --- .../android/exoplayer2/mediacodec/MediaCodecUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index bf795c5857..347afe29fd 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -482,13 +482,13 @@ public final class MediaCodecUtil { return null; } - Integer profile = AVC_PROFILE_NUMBER_TO_CONST.get(profileInteger); - if (profile == null) { + int profile = AVC_PROFILE_NUMBER_TO_CONST.get(profileInteger, -1); + if (profile == -1) { Log.w(TAG, "Unknown AVC profile: " + profileInteger); return null; } - Integer level = AVC_LEVEL_NUMBER_TO_CONST.get(levelInteger); - if (level == null) { + int level = AVC_LEVEL_NUMBER_TO_CONST.get(levelInteger, -1); + if (level == -1) { Log.w(TAG, "Unknown AVC level: " + levelInteger); return null; }