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

Commit 4cffa958 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Pass track from meta->message and vice versa" am: da161ed4 

am: 652b9008

Change-Id: I9ddc3076099c96436a4cb20b1cf730bf0b97527e
parents 47c293aa 652b9008

media/libstagefright/Utils.cpp

+1 −6
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ static std::vector<std::pair<const char *, uint32_t>> int32Mappings { 
        { "temporal-layer-id", kKeyTemporalLayerId },

        { "thumbnail-width", kKeyThumbnailWidth },

        { "thumbnail-height", kKeyThumbnailHeight },

        { "track-id", kKeyTrackID },

        { "valid-samples", kKeyValidSamples },

    }

};
@@ -896,12 +897,6 @@ status_t convertMetaDataToMessage( 
        msg->setInt32("is-sync-frame", 1);

    }



    // this only needs to be translated from meta to message as it is an extractor key

    int32_t trackID;

    if (meta->findInt32(kKeyTrackID, &trackID)) {

        msg->setInt32("track-id", trackID);

    }



    const char *lang;

    if (meta->findCString(kKeyMediaLanguage, &lang)) {

        msg->setString("language", lang);