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 {
// 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);
}
......
......@@ -1867,8 +1867,16 @@ public final class MatroskaExtractor implements Extractor {
|| 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.");
}
......
......@@ -58,9 +58,16 @@ public final class DvbSubtitleReader implements ElementaryStreamReader {
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;
}
}
......
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