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

Commit 94ce2185 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "GenericSource: reply mime information for *all* track types" into mnc-dev

parents 3a474aa6 755106eb

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1065,6 +1065,7 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const { 


    const char *mime;

    CHECK(meta->findCString(kKeyMIMEType, &mime));

    format->setString("mime", mime);



    int32_t trackType;

    if (!strncasecmp(mime, "video/", 6)) {
@@ -1085,8 +1086,6 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const { 
    format->setString("language", lang);



    if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) {

        format->setString("mime", mime);



        int32_t isAutoselect = 1, isDefault = 0, isForced = 0;

        meta->findInt32(kKeyTrackIsAutoselect, &isAutoselect);

        meta->findInt32(kKeyTrackIsDefault, &isDefault);

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -423,23 +423,23 @@ void NuPlayer::writeTrackInfo( 
    int32_t trackType;

    CHECK(format->findInt32("type", &trackType));



    AString mime;

    CHECK(format->findString("mime", &mime));



    AString lang;

    CHECK(format->findString("language", &lang));



    reply->writeInt32(2); // write something non-zero

    reply->writeInt32(trackType);

    reply->writeString16(String16(mime.c_str()));

    reply->writeString16(String16(lang.c_str()));



    if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) {

        AString mime;

        CHECK(format->findString("mime", &mime));



        int32_t isAuto, isDefault, isForced;

        CHECK(format->findInt32("auto", &isAuto));

        CHECK(format->findInt32("default", &isDefault));

        CHECK(format->findInt32("forced", &isForced));



        reply->writeString16(String16(mime.c_str()));

        reply->writeInt32(isAuto);

        reply->writeInt32(isDefault);

        reply->writeInt32(isForced);