loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1155 from bartsidee/1095-dev

Browse Source 
link track language attribute in Smoothstream parser
This commit is contained in:
ojw28 2016-01-16 15:37:07 +00:00
commit c01d0096ab
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
View File

@ -132,10 +132,10 @@ public class SmoothStreamingManifest {
public final byte[][] csd; public final byte[][] csd;
public TrackElement(int index, int bitrate, String mimeType, byte[][] csd, int maxWidth, public TrackElement(int index, int bitrate, String mimeType, byte[][] csd, int maxWidth,
int maxHeight, int sampleRate, int numChannels) { int maxHeight, int sampleRate, int numChannels, String language) {
this.csd = csd; this.csd = csd;
format = new Format(String.valueOf(index), mimeType, maxWidth, maxHeight, -1, numChannels, format = new Format(String.valueOf(index), mimeType, maxWidth, maxHeight, -1, numChannels,
sampleRate, bitrate); sampleRate, bitrate, language);
} }
@Override @Override

6
library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
View File

@ -543,6 +543,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
displayWidth = parseInt(parser, KEY_DISPLAY_WIDTH, -1); displayWidth = parseInt(parser, KEY_DISPLAY_WIDTH, -1);
displayHeight = parseInt(parser, KEY_DISPLAY_HEIGHT, -1); displayHeight = parseInt(parser, KEY_DISPLAY_HEIGHT, -1);
language = parser.getAttributeValue(null, KEY_LANGUAGE); language = parser.getAttributeValue(null, KEY_LANGUAGE);
putNormalizedAttribute(KEY_LANGUAGE, language);
timescale = parseInt(parser, KEY_TIME_SCALE, -1); timescale = parseInt(parser, KEY_TIME_SCALE, -1);
if (timescale == -1) { if (timescale == -1) {
timescale = (Long) getNormalizedAttribute(KEY_TIME_SCALE); timescale = (Long) getNormalizedAttribute(KEY_TIME_SCALE);
@ -595,6 +596,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
private static final String KEY_CHANNELS = "Channels"; private static final String KEY_CHANNELS = "Channels";
private static final String KEY_FOUR_CC = "FourCC"; private static final String KEY_FOUR_CC = "FourCC";
private static final String KEY_TYPE = "Type"; private static final String KEY_TYPE = "Type";
private static final String KEY_LANGUAGE = "Language";
private static final String KEY_MAX_WIDTH = "MaxWidth"; private static final String KEY_MAX_WIDTH = "MaxWidth";
private static final String KEY_MAX_HEIGHT = "MaxHeight"; private static final String KEY_MAX_HEIGHT = "MaxHeight";
@ -607,6 +609,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
private int maxHeight; private int maxHeight;
private int samplingRate; private int samplingRate;
private int channels; private int channels;
private String language;
public TrackElementParser(ElementParser parent, String baseUri) { public TrackElementParser(ElementParser parent, String baseUri) {
super(parent, baseUri, TAG); super(parent, baseUri, TAG);
@ -620,6 +623,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
index = parseInt(parser, KEY_INDEX, -1); index = parseInt(parser, KEY_INDEX, -1);
bitrate = parseRequiredInt(parser, KEY_BITRATE); bitrate = parseRequiredInt(parser, KEY_BITRATE);
language = (String) getNormalizedAttribute(KEY_LANGUAGE);
if (type == StreamElement.TYPE_VIDEO) { if (type == StreamElement.TYPE_VIDEO) {
maxHeight = parseRequiredInt(parser, KEY_MAX_HEIGHT); maxHeight = parseRequiredInt(parser, KEY_MAX_HEIGHT);
@ -664,7 +668,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
csd.toArray(csdArray); csd.toArray(csdArray);
} }
return new TrackElement(index, bitrate, mimeType, csdArray, maxWidth, maxHeight, samplingRate, return new TrackElement(index, bitrate, mimeType, csdArray, maxWidth, maxHeight, samplingRate,
channels); channels, language);
} }
private static String fourCCToMimeType(String fourCC) { private static String fourCCToMimeType(String fourCC) {