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

Commit 25736fd2 authored by Insun Kang's avatar Insun Kang Committed by James Dong
Browse files

To return default track info even if there's no metadata for a 

subtitle track.

It would rather return empty data than return NULL data for an existing track.

Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
parent db9b87e3

media/libstagefright/timedtext/TimedTextDriver.cpp

+8 −9
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ void TimedTextDriver::getTrackInfo(Parcel *parcel) { 
    for (iter = mTextSourceVector.begin();

         iter != mTextSourceVector.end(); ++iter) {

        sp<MetaData> meta = (*iter)->getFormat();

        if (meta != NULL) {



        // There are two fields.

        parcel->writeInt32(2);
@@ -222,11 +222,10 @@ void TimedTextDriver::getTrackInfo(Parcel *parcel) { 
        parcel->writeInt32(MEDIA_TRACK_TYPE_TIMEDTEXT);



        const char *lang = "und";

        if (meta != NULL) {

            meta->findCString(kKeyMediaLanguage, &lang);

            parcel->writeString16(String16(lang));

        } else {

            parcel->writeInt32(0);

        }

        parcel->writeString16(String16(lang));

    }

}