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

Commit 7e95a1c5 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Pass track from meta->message and vice versa 

CDD requires that the track is the same for compability track and the
actual Dolby Vision track, so we need to pass that back to the app.

Bug: 129367182
Test: CTS
Change-Id: Iab1ad3c4a593923ec6fc4231a4208806bf0159b7
parent 0683db73

media/libstagefright/Utils.cpp

+1 −6
Original line number Diff line number Diff line
@@ -751,6 +751,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 },

    }

};
@@ -958,12 +959,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);