Enhance copyWithManifestFormatInfo to handle muxed manifest formats

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

library/core/src/main/java/com/google/android/exoplayer2/Format.java

@@ -1086,15 +1086,35 @@ public final class Format implements Parcelable {
       return this;
       return this;
     }
     }
 
 
+    int trackType = MimeTypes.getTrackType(sampleMimeType);
+
     // Use manifest value only.
     // Use manifest value only.
     String id = manifestFormat.id;
     String id = manifestFormat.id;
+
     // Prefer manifest values, but fill in from sample format if missing.
     // Prefer manifest values, but fill in from sample format if missing.
     String label = manifestFormat.label != null ? manifestFormat.label : this.label;
     String label = manifestFormat.label != null ? manifestFormat.label : this.label;
-    String language = manifestFormat.language != null ? manifestFormat.language : this.language;
+    String language = this.language;
+    if ((trackType == C.TRACK_TYPE_TEXT || trackType == C.TRACK_TYPE_AUDIO)
+        && manifestFormat.language != null) {
+      language = manifestFormat.language;
+    }
+
     // Prefer sample format values, but fill in from manifest if missing.
     // Prefer sample format values, but fill in from manifest if missing.
-    String codecs = this.codecs == null ? manifestFormat.codecs : this.codecs;
     int bitrate = this.bitrate == NO_VALUE ? manifestFormat.bitrate : this.bitrate;
     int bitrate = this.bitrate == NO_VALUE ? manifestFormat.bitrate : this.bitrate;
-    float frameRate = this.frameRate == NO_VALUE ? manifestFormat.frameRate : this.frameRate;
+    String codecs = this.codecs;
+    if (codecs == null) {
+      // The manifest format may be muxed, so filter only codecs of this format's type. If we still
+      // have more than one codec then we're unable to uniquely identify which codec to fill in.
+      String codecsOfType = Util.getCodecsOfType(manifestFormat.codecs, trackType);
+      if (Util.splitCodecs(codecsOfType).length == 1) {
+        codecs = codecsOfType;
+      }
+    }
+    float frameRate = this.frameRate;
+    if (frameRate == NO_VALUE && trackType == C.TRACK_TYPE_VIDEO) {
+      frameRate = manifestFormat.frameRate;
+    }
+
     // Merge manifest and sample format values.
     // Merge manifest and sample format values.
     @C.SelectionFlags int selectionFlags = this.selectionFlags | manifestFormat.selectionFlags;
     @C.SelectionFlags int selectionFlags = this.selectionFlags | manifestFormat.selectionFlags;
     DrmInitData drmInitData =
     DrmInitData drmInitData =
@@ -1273,6 +1293,8 @@ public final class Format implements Parcelable {
         + ", "
         + ", "
         + sampleMimeType
         + sampleMimeType
         + ", "
         + ", "
+        + codecs
+        + ", "
         + bitrate
         + bitrate
         + ", "
         + ", "
         + language
         + language
@@ -1384,6 +1406,9 @@ public final class Format implements Parcelable {
     if (format.bitrate != Format.NO_VALUE) {
     if (format.bitrate != Format.NO_VALUE) {
       builder.append(", bitrate=").append(format.bitrate);
       builder.append(", bitrate=").append(format.bitrate);
     }
     }
+    if (format.codecs != null) {
+      builder.append(", codecs=").append(format.codecs);
+    }
     if (format.width != Format.NO_VALUE && format.height != Format.NO_VALUE) {
     if (format.width != Format.NO_VALUE && format.height != Format.NO_VALUE) {
       builder.append(", res=").append(format.width).append("x").append(format.height);
       builder.append(", res=").append(format.width).append("x").append(format.height);
     }
     }

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

@@ -167,7 +167,7 @@ public final class MimeTypes {
     if (codecs == null) {
     if (codecs == null) {
       return null;
       return null;
     }
     }
-    String[] codecList = Util.split(codecs, ",");
+    String[] codecList = Util.splitCodecs(codecs);
     for (String codec : codecList) {
     for (String codec : codecList) {
       String mimeType = getMediaMimeType(codec);
       String mimeType = getMediaMimeType(codec);
       if (mimeType != null && isVideo(mimeType)) {
       if (mimeType != null && isVideo(mimeType)) {
@@ -187,7 +187,7 @@ public final class MimeTypes {
     if (codecs == null) {
     if (codecs == null) {
       return null;
       return null;
     }
     }
-    String[] codecList = Util.split(codecs, ",");
+    String[] codecList = Util.splitCodecs(codecs);
     for (String codec : codecList) {
     for (String codec : codecList) {
       String mimeType = getMediaMimeType(codec);
       String mimeType = getMediaMimeType(codec);
       if (mimeType != null && isAudio(mimeType)) {
       if (mimeType != null && isAudio(mimeType)) {

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

@@ -1062,10 +1062,10 @@ public final class Util {
    *     {@code trackType}.
    *     {@code trackType}.
    */
    */
   public static String getCodecsOfType(String codecs, int trackType) {
   public static String getCodecsOfType(String codecs, int trackType) {
-    if (TextUtils.isEmpty(codecs)) {
+    String[] codecArray = splitCodecs(codecs);
+    if (codecArray.length == 0) {
       return null;
       return null;
     }
     }
-    String[] codecArray = split(codecs.trim(), "(\\s*,\\s*)");
     StringBuilder builder = new StringBuilder();
     StringBuilder builder = new StringBuilder();
     for (String codec : codecArray) {
     for (String codec : codecArray) {
       if (trackType == MimeTypes.getTrackTypeOfCodec(codec)) {
       if (trackType == MimeTypes.getTrackTypeOfCodec(codec)) {
@@ -1079,6 +1079,19 @@ public final class Util {
   }
   }
 
 
   /**
   /**
+   * Splits a codecs sequence string, as defined in RFC 6381, into individual codec strings.
+   *
+   * @param codecs A codec sequence string, as defined in RFC 6381.
+   * @return The split codecs, or an array of length zero if the input was empty.
+   */
+  public static String[] splitCodecs(String codecs) {
+    if (TextUtils.isEmpty(codecs)) {
+      return new String[0];
+    }
+    return split(codecs.trim(), "(\\s*,\\s*)");
+  }
+
+  /**
    * Converts a sample bit depth to a corresponding PCM encoding constant.
    * Converts a sample bit depth to a corresponding PCM encoding constant.
    *
    *
    * @param bitDepth The bit depth. Supported values are 8, 16, 24 and 32.
    * @param bitDepth The bit depth. Supported values are 8, 16, 24 and 32.