From 468296c2bcdcd20fc1181a2957fa88542c7a2962 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 21 May 2019 11:00:54 +0100
Subject: [PATCH] Suppress remaining ConstantCaseForConstant warnings

PiperOrigin-RevId: 249217126
---
 .../exoplayer2/extractor/mp4/AtomParsers.java   | 17 ++++++++++++++++-
 .../extractor/mp4/FragmentedMp4Extractor.java   |  3 ++-
 .../text/webvtt/Mp4WebvttDecoder.java           | 10 +++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 3b74240379..90f8b125ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -42,18 +42,33 @@ import java.util.Collections;
 import java.util.List;
 
 /** Utility methods for parsing MP4 format atom payloads according to ISO 14496-12. */
-@SuppressWarnings({"ConstantField", "ConstantCaseForConstants"})
+@SuppressWarnings({"ConstantField"})
 /* package */ final class AtomParsers {
 
   private static final String TAG = "AtomParsers";
 
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_vide = Util.getIntegerCodeForString("vide");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_soun = Util.getIntegerCodeForString("soun");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_text = Util.getIntegerCodeForString("text");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_sbtl = Util.getIntegerCodeForString("sbtl");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_subt = Util.getIntegerCodeForString("subt");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_clcp = Util.getIntegerCodeForString("clcp");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_meta = Util.getIntegerCodeForString("meta");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_mdta = Util.getIntegerCodeForString("mdta");
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 4f45e85762..4d51fb9b8e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -55,6 +55,7 @@ import java.util.List;
 import java.util.UUID;
 
 /** Extracts data from the FMP4 container format. */
+@SuppressWarnings("ConstantField")
 public class FragmentedMp4Extractor implements Extractor {
 
   /** Factory for {@link FragmentedMp4Extractor} instances. */
@@ -104,7 +105,7 @@ public class FragmentedMp4Extractor implements Extractor {
 
   private static final String TAG = "FragmentedMp4Extractor";
 
-  @SuppressWarnings("ConstantField")
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig");
 
   private static final byte[] PIFF_SAMPLE_ENCRYPTION_BOX_EXTENDED_TYPE =
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
index 8cb0ac58c7..5e425cc12f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
@@ -24,15 +24,19 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-/**
- * A {@link SimpleSubtitleDecoder} for Webvtt embedded in a Mp4 container file.
- */
+/** A {@link SimpleSubtitleDecoder} for Webvtt embedded in a Mp4 container file. */
+@SuppressWarnings("ConstantField")
 public final class Mp4WebvttDecoder extends SimpleSubtitleDecoder {
 
   private static final int BOX_HEADER_SIZE = 8;
 
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_payl = Util.getIntegerCodeForString("payl");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_sttg = Util.getIntegerCodeForString("sttg");
+
+  @SuppressWarnings("ConstantCaseForConstants")
   private static final int TYPE_vttc = Util.getIntegerCodeForString("vttc");
 
   private final ParsableByteArray sampleData;