From 19cf24234c8bee0e5719baa86c90fd9e0fb8478b Mon Sep 17 00:00:00 2001
From: Bart van den Ende <bart@twcapps.com>
Date: Fri, 15 Jan 2016 12:10:20 +0100
Subject: [PATCH 1/3] resolve #1095 map the audio track language to the element
 parser instead of the track parser

---
 .../exoplayer/smoothstreaming/SmoothStreamingManifest.java   | 4 ++--
 .../smoothstreaming/SmoothStreamingManifestParser.java       | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
index 34c3880fa8..568ad2147d 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
@@ -132,10 +132,10 @@ public class SmoothStreamingManifest {
     public final byte[][] csd;
 
     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;
       format = new Format(String.valueOf(index), mimeType, maxWidth, maxHeight, -1, numChannels,
-          sampleRate, bitrate);
+          sampleRate, bitrate, language);
     }
 
     @Override
diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
index b4c91b7935..d48a5a7110 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
@@ -595,6 +595,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
     private static final String KEY_CHANNELS = "Channels";
     private static final String KEY_FOUR_CC = "FourCC";
     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_HEIGHT = "MaxHeight";
 
@@ -607,6 +608,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
     private int maxHeight;
     private int samplingRate;
     private int channels;
+    private String language;
 
     public TrackElementParser(ElementParser parent, String baseUri) {
       super(parent, baseUri, TAG);
@@ -632,6 +634,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
         // If fourCC is missing and the stream type is audio, we assume AAC.
         mimeType = fourCC != null ? fourCCToMimeType(fourCC)
             : type == StreamElement.TYPE_AUDIO ? MimeTypes.AUDIO_AAC : null;
+        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       }
 
       if (type == StreamElement.TYPE_AUDIO) {
@@ -664,7 +667,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
         csd.toArray(csdArray);
       }
       return new TrackElement(index, bitrate, mimeType, csdArray, maxWidth, maxHeight, samplingRate,
-          channels);
+          channels, language);
     }
 
     private static String fourCCToMimeType(String fourCC) {

From d5425bb64acdff5e67913232ac0f1c27748f1e6a Mon Sep 17 00:00:00 2001
From: Bart van den Ende <bart@twcapps.com>
Date: Fri, 15 Jan 2016 15:03:46 +0100
Subject: [PATCH 2/3] resolve #1095 store the language as normalised attribute
 so we can access it from the track parser

---
 .../smoothstreaming/SmoothStreamingManifestParser.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
index d48a5a7110..cc4a6996d5 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
@@ -543,6 +543,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
       displayWidth = parseInt(parser, KEY_DISPLAY_WIDTH, -1);
       displayHeight = parseInt(parser, KEY_DISPLAY_HEIGHT, -1);
       language = parser.getAttributeValue(null, KEY_LANGUAGE);
+      putNormalizedAttribute(KEY_LANGUAGE, language);
       timescale = parseInt(parser, KEY_TIME_SCALE, -1);
       if (timescale == -1) {
         timescale = (Long) getNormalizedAttribute(KEY_TIME_SCALE);
@@ -634,12 +635,12 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
         // If fourCC is missing and the stream type is audio, we assume AAC.
         mimeType = fourCC != null ? fourCCToMimeType(fourCC)
             : type == StreamElement.TYPE_AUDIO ? MimeTypes.AUDIO_AAC : null;
-        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       }
 
       if (type == StreamElement.TYPE_AUDIO) {
         samplingRate = parseRequiredInt(parser, KEY_SAMPLING_RATE);
         channels = parseRequiredInt(parser, KEY_CHANNELS);
+        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       } else {
         samplingRate = -1;
         channels = -1;

From 8e1f14cbc3bcb4a5f7ccab1cb4fbba24bde85fbe Mon Sep 17 00:00:00 2001
From: Bart van den Ende <bart@twcapps.com>
Date: Sat, 16 Jan 2016 12:23:36 +0100
Subject: [PATCH 3/3] resolve #1095 get language for all types, not just audio

---
 .../smoothstreaming/SmoothStreamingManifestParser.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
index cc4a6996d5..6efa6e95d9 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
@@ -623,6 +623,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
 
       index = parseInt(parser, KEY_INDEX, -1);
       bitrate = parseRequiredInt(parser, KEY_BITRATE);
+      language = (String) getNormalizedAttribute(KEY_LANGUAGE);
 
       if (type == StreamElement.TYPE_VIDEO) {
         maxHeight = parseRequiredInt(parser, KEY_MAX_HEIGHT);
@@ -640,7 +641,6 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
       if (type == StreamElement.TYPE_AUDIO) {
         samplingRate = parseRequiredInt(parser, KEY_SAMPLING_RATE);
         channels = parseRequiredInt(parser, KEY_CHANNELS);
-        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       } else {
         samplingRate = -1;
         channels = -1;