Set selection flags on image sample formats.

Issue: #3008 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=181455340
google · Jan 15, 2018 · 214d46d · 214d46d
1 parent 1fc250a
commit 214d46d
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 10 deletions.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -324,11 +324,41 @@ public static Format createTextSampleFormat(String id, String sampleMimeType, St
 
   // Image.
 
-  public static Format createImageSampleFormat(String id, String sampleMimeType, String codecs,
-      int bitrate, List<byte[]> initializationData, String language, DrmInitData drmInitData) {
-    return new Format(id, null, sampleMimeType, codecs, bitrate, NO_VALUE, NO_VALUE, NO_VALUE,
-        NO_VALUE, NO_VALUE, NO_VALUE, null, NO_VALUE, null, NO_VALUE, NO_VALUE, NO_VALUE, NO_VALUE,
-        NO_VALUE, 0, language, NO_VALUE, OFFSET_SAMPLE_RELATIVE, initializationData, drmInitData,
+  public static Format createImageSampleFormat(
+      String id,
+      String sampleMimeType,
+      String codecs,
+      int bitrate,
+      @C.SelectionFlags int selectionFlags,
+      List<byte[]> initializationData,
+      String language,
+      DrmInitData drmInitData) {
+    return new Format(
+        id,
+        null,
+        sampleMimeType,
+        codecs,
+        bitrate,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        null,
+        NO_VALUE,
+        null,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        NO_VALUE,
+        selectionFlags,
+        language,
+        NO_VALUE,
+        OFFSET_SAMPLE_RELATIVE,
+        initializationData,
+        drmInitData,
         null);
   }
 

diff --git a/...ary/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/...ary/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
@@ -1867,8 +1867,16 @@ public void initializeOutput(ExtractorOutput output, int trackId) throws ParserE
           || MimeTypes.APPLICATION_PGS.equals(mimeType)
           || MimeTypes.APPLICATION_DVBSUBS.equals(mimeType)) {
         type = C.TRACK_TYPE_TEXT;
-        format = Format.createImageSampleFormat(Integer.toString(trackId), mimeType, null,
-            Format.NO_VALUE, initializationData, language, drmInitData);
+        format =
+            Format.createImageSampleFormat(
+                Integer.toString(trackId),
+                mimeType,
+                null,
+                Format.NO_VALUE,
+                selectionFlags,
+                initializationData,
+                language,
+                drmInitData);
       } else {
         throw new ParserException("Unexpected MIME type.");
       }

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
@@ -58,9 +58,16 @@ public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGen
       DvbSubtitleInfo subtitleInfo = subtitleInfos.get(i);
       idGenerator.generateNewId();
       TrackOutput output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_TEXT);
-      output.format(Format.createImageSampleFormat(idGenerator.getFormatId(),
-          MimeTypes.APPLICATION_DVBSUBS, null, Format.NO_VALUE,
-          Collections.singletonList(subtitleInfo.initializationData), subtitleInfo.language, null));
+      output.format(
+          Format.createImageSampleFormat(
+              idGenerator.getFormatId(),
+              MimeTypes.APPLICATION_DVBSUBS,
+              null,
+              Format.NO_VALUE,
+              0,
+              Collections.singletonList(subtitleInfo.initializationData),
+              subtitleInfo.language,
+              null));
       outputs[i] = output;
     }
   }