Correctly propagate format identifier for CEA-608 in HLS

Issue: #3033 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161512537
google · Jul 12, 2017 · 0052a70 · 0052a70
1 parent ef56c9f
commit 0052a70
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java
@@ -51,9 +51,10 @@ public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGen
       Assertions.checkArgument(MimeTypes.APPLICATION_CEA608.equals(channelMimeType)
           || MimeTypes.APPLICATION_CEA708.equals(channelMimeType),
           "Invalid closed caption mime type provided: " + channelMimeType);
-      output.format(Format.createTextSampleFormat(idGenerator.getFormatId(), channelMimeType, null,
-          Format.NO_VALUE, channelFormat.selectionFlags, channelFormat.language,
-          channelFormat.accessibilityChannel, null));
+      String formatId = channelFormat.id != null ? channelFormat.id : idGenerator.getFormatId();
+      output.format(Format.createTextSampleFormat(formatId, channelMimeType, null, Format.NO_VALUE,
+          channelFormat.selectionFlags, channelFormat.language, channelFormat.accessibilityChannel,
+          null));
       outputs[i] = output;
     }
   }