From 05dcf502e55e94d4288628e40d0b69bea6bab6d3 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 20 Aug 2018 04:28:11 -0700 Subject: [PATCH] Add missing cases to IntDef switch + fix default locale usage ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=209396260 --- .../exoplayer2/audio/ResamplingAudioProcessor.java | 4 ++++ .../upstream/cache/DefaultContentMetadata.java | 9 ++++++--- .../java/com/google/android/exoplayer2/util/Util.java | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java index eac0bffd65..3ae1a393f9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java @@ -98,6 +98,8 @@ import java.nio.ByteOrder; break; case C.ENCODING_PCM_16BIT: case C.ENCODING_PCM_FLOAT: + case C.ENCODING_PCM_A_LAW: + case C.ENCODING_PCM_MU_LAW: case C.ENCODING_INVALID: case Format.NO_VALUE: default: @@ -134,6 +136,8 @@ import java.nio.ByteOrder; break; case C.ENCODING_PCM_16BIT: case C.ENCODING_PCM_FLOAT: + case C.ENCODING_PCM_A_LAW: + case C.ENCODING_PCM_MU_LAW: case C.ENCODING_INVALID: case Format.NO_VALUE: default: diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java index cf63bcc4f6..e16ff5483a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java @@ -188,9 +188,12 @@ public final class DefaultContentMetadata implements ContentMetadata { byte[] bytes = getBytes(value); if (bytes.length > MAX_VALUE_LENGTH) { throw new IllegalArgumentException( - String.format( - "The size of %s (%d) is greater than maximum allowed: %d", - name, bytes.length, MAX_VALUE_LENGTH)); + "The size of " + + name + + " (" + + bytes.length + + ") is greater than maximum allowed: " + + MAX_VALUE_LENGTH); } metadata.put(name, bytes); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java index 160dccbcad..35cfd3d24b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -1245,6 +1245,8 @@ public final class Util { case C.ENCODING_PCM_32BIT: case C.ENCODING_PCM_FLOAT: return channelCount * 4; + case C.ENCODING_PCM_A_LAW: + case C.ENCODING_PCM_MU_LAW: case C.ENCODING_INVALID: case Format.NO_VALUE: default: @@ -1325,6 +1327,7 @@ public final class Util { case C.USAGE_NOTIFICATION_EVENT: return C.STREAM_TYPE_NOTIFICATION; case C.USAGE_ASSISTANCE_ACCESSIBILITY: + case C.USAGE_ASSISTANT: case C.USAGE_UNKNOWN: default: return C.STREAM_TYPE_DEFAULT;