Clean up E-AC-3 naming.

library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java

@@ -861,7 +861,7 @@ public final class AudioTrack {
     switch (mimeType) {
       case MimeTypes.AUDIO_AC3:
         return C.ENCODING_AC3;
-      case MimeTypes.AUDIO_EC3:
+      case MimeTypes.AUDIO_E_AC3:
         return C.ENCODING_E_AC3;
       case MimeTypes.AUDIO_DTS:
         return C.ENCODING_DTS;

library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java

@@ -708,7 +708,7 @@ import java.util.List;
     if (atomType == Atom.TYPE_ac_3) {
       mimeType = MimeTypes.AUDIO_AC3;
     } else if (atomType == Atom.TYPE_ec_3) {
-      mimeType = MimeTypes.AUDIO_EC3;
+      mimeType = MimeTypes.AUDIO_E_AC3;
     } else if (atomType == Atom.TYPE_dtsc || atomType == Atom.TYPE_dtse) {
       mimeType = MimeTypes.AUDIO_DTS;
     } else if (atomType == Atom.TYPE_dtsh || atomType == Atom.TYPE_dtsl) {
@@ -830,7 +830,7 @@ import java.util.List;
         mimeType = MimeTypes.AUDIO_AC3;
         break;
       case 0xA6:
-        mimeType = MimeTypes.AUDIO_EC3;
+        mimeType = MimeTypes.AUDIO_E_AC3;
         break;
       case 0xA9:
       case 0xAC:

library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java

@@ -44,14 +44,15 @@ public final class TsExtractor implements Extractor {
   private static final int TS_STREAM_TYPE_MPA = 0x03;
   private static final int TS_STREAM_TYPE_MPA_LSF = 0x04;
   private static final int TS_STREAM_TYPE_AAC = 0x0F;
-  private static final int TS_STREAM_TYPE_ATSC_AC3 = 0x81;
-  private static final int TS_STREAM_TYPE_ATSC_E_AC3 = 0x87;
+  private static final int TS_STREAM_TYPE_AC3 = 0x81;
+  private static final int TS_STREAM_TYPE_E_AC3 = 0x87;
   private static final int TS_STREAM_TYPE_H264 = 0x1B;
   private static final int TS_STREAM_TYPE_H265 = 0x24;
   private static final int TS_STREAM_TYPE_ID3 = 0x15;
   private static final int TS_STREAM_TYPE_EIA608 = 0x100; // 0xFF + 1
 
   private static final long AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("AC-3");
+  private static final long E_AC3_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("EAC3");
   private static final long HEVC_FORMAT_IDENTIFIER = Util.getIntegerCodeForString("HEVC");
 
   private final PtsTimestampAdjuster ptsTimestampAdjuster;
@@ -308,8 +309,8 @@ public final class TsExtractor implements Extractor {
           case TS_STREAM_TYPE_AAC:
             pesPayloadReader = new AdtsReader(output.track(TS_STREAM_TYPE_AAC));
             break;
-          case TS_STREAM_TYPE_ATSC_E_AC3:
-          case TS_STREAM_TYPE_ATSC_AC3:
+          case TS_STREAM_TYPE_E_AC3:
+          case TS_STREAM_TYPE_AC3:
             pesPayloadReader = new Ac3Reader(output.track(streamType));
             break;
           case TS_STREAM_TYPE_H264:
@@ -352,7 +353,9 @@ public final class TsExtractor implements Extractor {
         if (descriptorTag == 0x05) { // registration_descriptor
           long formatIdentifier = data.readUnsignedInt();
           if (formatIdentifier == AC3_FORMAT_IDENTIFIER) {
-            streamType = TS_STREAM_TYPE_ATSC_AC3;
+            streamType = TS_STREAM_TYPE_AC3;
+          } else if (formatIdentifier == E_AC3_FORMAT_IDENTIFIER) {
+            streamType = TS_STREAM_TYPE_E_AC3;
           } else if (formatIdentifier == HEVC_FORMAT_IDENTIFIER) {
             streamType = TS_STREAM_TYPE_H265;
           }

library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java

@@ -85,7 +85,7 @@ public final class Ac3Util {
     if ((nextByte & 0x01) != 0) {
       channelCount++;
     }
-    return MediaFormat.createAudioFormat(trackId, MimeTypes.AUDIO_EC3, MediaFormat.NO_VALUE,
+    return MediaFormat.createAudioFormat(trackId, MimeTypes.AUDIO_E_AC3, MediaFormat.NO_VALUE,
         MediaFormat.NO_VALUE, durationUs, channelCount, sampleRate, null, language);
   }
 

library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java

@@ -45,7 +45,7 @@ public final class MimeTypes {
   public static final String AUDIO_MPEG_L2 = BASE_TYPE_AUDIO + "/mpeg-L2";
   public static final String AUDIO_RAW = BASE_TYPE_AUDIO + "/raw";
   public static final String AUDIO_AC3 = BASE_TYPE_AUDIO + "/ac3";
-  public static final String AUDIO_EC3 = BASE_TYPE_AUDIO + "/eac3";
+  public static final String AUDIO_E_AC3 = BASE_TYPE_AUDIO + "/eac3";
   public static final String AUDIO_TRUEHD = BASE_TYPE_AUDIO + "/true-hd";
   public static final String AUDIO_DTS = BASE_TYPE_AUDIO + "/vnd.dts";
   public static final String AUDIO_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd";
@@ -164,7 +164,7 @@ public final class MimeTypes {
       } else if (codec.startsWith("ac-3") || codec.startsWith("dac3")) {
         return MimeTypes.AUDIO_AC3;
       } else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
-        return MimeTypes.AUDIO_EC3;
+        return MimeTypes.AUDIO_E_AC3;
       } else if (codec.startsWith("dtsc") || codec.startsWith("dtse")) {
         return MimeTypes.AUDIO_DTS;
       } else if (codec.startsWith("dtsh") || codec.startsWith("dtsl")) {