commit 7f38463ff7b1a719b53a701e2c8f79bfbd393426
author Wei Jia <wjia@google.com> Thu Oct 19 18:02:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 18:02:00 2017 +0000
tree c127ea24c2e1de4ce2a834e572a70f04ca802b42
parent 5b769acf63bb78197c39f9930133c7f79cfdffd2
parent ac3e46f054ac5f4f1347ddd380b46911cf240926

Merge "Read track language information from Matroska files" am: 49d0502f1a am: d79a838546 am: f6133b7456
am: ac3e46f054

Change-Id: Id7a2112ee16e7d0cbd58853daf9fbb47faf8a9aa

media/extractors/mkv/MatroskaExtractor.cpp

diff --git a/media/extractors/mkv/MatroskaExtractor.cpp b/media/extractors/mkv/MatroskaExtractor.cpp
index d57305c..5a8e79d 100644
--- a/media/extractors/mkv/MatroskaExtractor.cpp
+++ b/media/extractors/mkv/MatroskaExtractor.cpp
@@ -1459,6 +1459,14 @@
                 continue;
         }
 
+        const char *language = track->GetLanguage();
+        if (language != NULL) {
+           char lang[4];
+           strncpy(lang, language, 3);
+           lang[3] = '\0';
+           meta->setCString(kKeyMediaLanguage, lang);
+        }
+
         if (err != OK) {
             ALOGE("skipping track, codec specific data was malformed.");
             continue;