commit 49d0502f1a227a510df65ec74f14eef91185dc6a
author Wei Jia <wjia@google.com> Thu Oct 19 17:19:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 19 17:19:11 2017 +0000
tree c9ad9d36842f4cb21b96875e16c8f11e56be4843
parent 159158c3cd9f39089c1d60650776b1d9d2180d9e
parent 0c411418d01d477b60f087f7bc685cf176ae197c

Merge "Read track language information from Matroska files"

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index bea4ced..6135b59 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -1399,6 +1399,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;