Commit 214d46d9 by olly Committed by Oliver Woodman

Set selection flags on image sample formats.

Issue: #3008

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=181455340
parent 1fc250a9
...@@ -324,11 +324,41 @@ public final class Format implements Parcelable { ...@@ -324,11 +324,41 @@ public final class Format implements Parcelable {
// Image. // Image.
public static Format createImageSampleFormat(String id, String sampleMimeType, String codecs, public static Format createImageSampleFormat(
int bitrate, List<byte[]> initializationData, String language, DrmInitData drmInitData) { String id,
return new Format(id, null, sampleMimeType, codecs, bitrate, NO_VALUE, NO_VALUE, NO_VALUE, String sampleMimeType,
NO_VALUE, NO_VALUE, NO_VALUE, null, NO_VALUE, null, NO_VALUE, NO_VALUE, NO_VALUE, NO_VALUE, String codecs,
NO_VALUE, 0, language, NO_VALUE, OFFSET_SAMPLE_RELATIVE, initializationData, drmInitData, 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); null);
} }
......
...@@ -1867,8 +1867,16 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1867,8 +1867,16 @@ public final class MatroskaExtractor implements Extractor {
|| MimeTypes.APPLICATION_PGS.equals(mimeType) || MimeTypes.APPLICATION_PGS.equals(mimeType)
|| MimeTypes.APPLICATION_DVBSUBS.equals(mimeType)) { || MimeTypes.APPLICATION_DVBSUBS.equals(mimeType)) {
type = C.TRACK_TYPE_TEXT; type = C.TRACK_TYPE_TEXT;
format = Format.createImageSampleFormat(Integer.toString(trackId), mimeType, null, format =
Format.NO_VALUE, initializationData, language, drmInitData); Format.createImageSampleFormat(
Integer.toString(trackId),
mimeType,
null,
Format.NO_VALUE,
selectionFlags,
initializationData,
language,
drmInitData);
} else { } else {
throw new ParserException("Unexpected MIME type."); throw new ParserException("Unexpected MIME type.");
} }
......
...@@ -58,9 +58,16 @@ public final class DvbSubtitleReader implements ElementaryStreamReader { ...@@ -58,9 +58,16 @@ public final class DvbSubtitleReader implements ElementaryStreamReader {
DvbSubtitleInfo subtitleInfo = subtitleInfos.get(i); DvbSubtitleInfo subtitleInfo = subtitleInfos.get(i);
idGenerator.generateNewId(); idGenerator.generateNewId();
TrackOutput output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_TEXT); TrackOutput output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_TEXT);
output.format(Format.createImageSampleFormat(idGenerator.getFormatId(), output.format(
MimeTypes.APPLICATION_DVBSUBS, null, Format.NO_VALUE, Format.createImageSampleFormat(
Collections.singletonList(subtitleInfo.initializationData), subtitleInfo.language, null)); idGenerator.getFormatId(),
MimeTypes.APPLICATION_DVBSUBS,
null,
Format.NO_VALUE,
0,
Collections.singletonList(subtitleInfo.initializationData),
subtitleInfo.language,
null));
outputs[i] = output; outputs[i] = output;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment