From 8f32c29cc6691536255d6d93bfd6537f1e245a5f Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Thu, 31 Jan 2019 11:31:19 +0800
Subject: [PATCH] Update code based on code review result

 * remove field mimeType in Ac4Util.java
 * change constant CHANNEL_COUNT_2 to private in Ac4Util.java
---
 .../com/google/android/exoplayer2/audio/Ac4Util.java  | 11 ++---------
 .../android/exoplayer2/extractor/ts/Ac4Reader.java    |  5 +++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
index 9b845a14d4..fc4c8efb85 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
@@ -33,10 +33,6 @@ public final class Ac4Util {
    */
   public static final class SyncFrameInfo {
 
-    /**
-     * The sample mime type of the bitstream is {@link MimeTypes#AUDIO_AC4}.
-     */
-    public final String mimeType;
     /**
      * The bitstream version.
      */
@@ -59,13 +55,11 @@ public final class Ac4Util {
     public final int sampleCount;
 
     private SyncFrameInfo(
-        String mimeType,
         int bitstreamVersion,
         int channelCount,
         int sampleRate,
         int frameSize,
         int sampleCount) {
-      this.mimeType = mimeType;
       this.bitstreamVersion = bitstreamVersion;
       this.channelCount = channelCount;
       this.sampleRate = sampleRate;
@@ -78,7 +72,7 @@ public final class Ac4Util {
    * The channel count of AC-4 stream.
    */
   // TODO: Parse AC-4 stream channel count.
-  public static final int CHANNEL_COUNT_2 = 2;
+  private static final int CHANNEL_COUNT_2 = 2;
   /**
    * The header size for AC-4 parser. Only needs to be as big as we need to read, not the full
    * header size.
@@ -207,8 +201,7 @@ public final class Ac4Util {
           break;
       }
     }
-    return new SyncFrameInfo(
-        MimeTypes.AUDIO_AC4, bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
+    return new SyncFrameInfo(bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
index a1e5e51e9d..fd1a2bae44 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.audio.Ac4Util.SyncFrameInfo;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
+import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.lang.annotation.Documented;
@@ -198,8 +199,8 @@ public final class Ac4Reader implements ElementaryStreamReader {
     SyncFrameInfo frameInfo = Ac4Util.parseAc4SyncframeInfo(headerScratchBits);
     if (format == null || frameInfo.channelCount != format.channelCount
         || frameInfo.sampleRate != format.sampleRate
-        || frameInfo.mimeType != format.sampleMimeType) {
-      format = Format.createAudioSampleFormat(trackFormatId, frameInfo.mimeType, null,
+        || !MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
+      format = Format.createAudioSampleFormat(trackFormatId, MimeTypes.AUDIO_AC4, null,
           Format.NO_VALUE, Format.NO_VALUE, frameInfo.channelCount, frameInfo.sampleRate, null,
           null, 0, language);
       output.format(format);