Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6133b74 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "Read track language information from Matroska files" am: 49d0502f 

am: d79a8385

Change-Id: Icecee13e311cb9731acbfd031dbea1bffbc0e340
parents 8db99a18 d79a8385

media/libstagefright/matroska/MatroskaExtractor.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,14 @@ void MatroskaExtractor::addTracks() { 
                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;