Refer to E-AC3 JOC rather than Atmos in MIME type/comments

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=184501752

library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java

@@ -198,7 +198,7 @@ public final class Ac3Util {
     if (data.bytesLeft() > 0) {
       nextByte = data.readUnsignedByte();
       if ((nextByte & 0x01) != 0) { // flag_ec3_extension_type_a
-        mimeType = MimeTypes.AUDIO_ATMOS;
+        mimeType = MimeTypes.AUDIO_E_AC3_JOC;
       }
     }
     return Format.createAudioSampleFormat(trackId, mimeType, null, Format.NO_VALUE,
@@ -385,7 +385,7 @@ public final class Ac3Util {
       if (data.readBit()) { // addbsie
         int addbsil = data.readBits(6);
         if (addbsil == 1 && data.readBits(8) == 1) { // addbsi
-          mimeType = MimeTypes.AUDIO_ATMOS;
+          mimeType = MimeTypes.AUDIO_E_AC3_JOC;
         }
       }
     } else /* is AC-3 */ {

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java

@@ -158,8 +158,8 @@ public final class MediaCodecUtil {
             + ". Assuming: " + decoderInfos.get(0).name);
       }
     }
-    if (MimeTypes.AUDIO_ATMOS.equals(mimeType)) {
-      // E-AC3 decoders can decode Atmos streams, but in 2-D rather than 3-D.
+    if (MimeTypes.AUDIO_E_AC3_JOC.equals(mimeType)) {
+      // E-AC3 decoders can decode JOC streams, but in 2-D rather than 3-D.
       CodecKey eac3Key = new CodecKey(MimeTypes.AUDIO_E_AC3, key.secure);
       ArrayList<MediaCodecInfo> eac3DecoderInfos =
           getDecoderInfosInternal(eac3Key, mediaCodecList, mimeType);
@@ -382,8 +382,8 @@ public final class MediaCodecUtil {
       return false;
     }
 
-    // MTK E-AC3 decoder doesn't support decoding Atmos streams in 2-D. See [Internal: b/69400041].
-    if (MimeTypes.AUDIO_ATMOS.equals(requestedMimeType)
+    // MTK E-AC3 decoder doesn't support decoding JOC streams in 2-D. See [Internal: b/69400041].
+    if (MimeTypes.AUDIO_E_AC3_JOC.equals(requestedMimeType)
         && "OMX.MTK.AUDIO.DECODER.DSPAC3".equals(name)) {
       return false;
     }

library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java

@@ -52,7 +52,7 @@ public final class MimeTypes {
   public static final String AUDIO_MLAW = BASE_TYPE_AUDIO + "/g711-mlaw";
   public static final String AUDIO_AC3 = BASE_TYPE_AUDIO + "/ac3";
   public static final String AUDIO_E_AC3 = BASE_TYPE_AUDIO + "/eac3";
-  public static final String AUDIO_ATMOS = BASE_TYPE_AUDIO + "/eac3-joc";
+  public static final String AUDIO_E_AC3_JOC = BASE_TYPE_AUDIO + "/eac3-joc";
   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";
@@ -200,7 +200,7 @@ public final class MimeTypes {
     } else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
       return MimeTypes.AUDIO_E_AC3;
     } else if (codec.startsWith("ec+3")) {
-      return MimeTypes.AUDIO_ATMOS;
+      return MimeTypes.AUDIO_E_AC3_JOC;
     } else if (codec.startsWith("dtsc") || codec.startsWith("dtse")) {
       return MimeTypes.AUDIO_DTS;
     } else if (codec.startsWith("dtsh") || codec.startsWith("dtsl")) {
@@ -258,7 +258,7 @@ public final class MimeTypes {
       case MimeTypes.AUDIO_AC3:
         return C.ENCODING_AC3;
       case MimeTypes.AUDIO_E_AC3:
-      case MimeTypes.AUDIO_ATMOS:
+      case MimeTypes.AUDIO_E_AC3_JOC:
         return C.ENCODING_E_AC3;
       case MimeTypes.AUDIO_DTS:
         return C.ENCODING_DTS;

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java

@@ -1072,7 +1072,7 @@ public class DashManifestParser extends DefaultHandler
       String schemeIdUri = descriptor.schemeIdUri;
       if ("tag:dolby.com,2014:dash:DolbyDigitalPlusExtensionType:2014".equals(schemeIdUri)
           && "ec+3".equals(descriptor.value)) {
-        return MimeTypes.AUDIO_ATMOS;
+        return MimeTypes.AUDIO_E_AC3_JOC;
       }
     }
     return MimeTypes.AUDIO_E_AC3;