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

Commit 69a02562 authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Add key for teletext magazine and page number" am: 94618f06 am: fdf5d601 am: f9197f7c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2261508



Change-Id: I9e29027a512758a8a3c511022d5ea2b61bd30e32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbc83c4b f9197f7c

media/libstagefright/Utils.cpp

+22 −0
Original line number Diff line number Diff line
@@ -796,6 +796,8 @@ static std::vector<std::pair<const char *, uint32_t>> int32Mappings { 
        { "valid-samples", kKeyValidSamples },

        { "dvb-component-tag", kKeyDvbComponentTag},

        { "dvb-audio-description", kKeyDvbAudioDescription},

        { "dvb-teletext-magazine-number", kKeyDvbTeletextMagazineNumber},

        { "dvb-teletext-page-number", kKeyDvbTeletextPageNumber},

    }

};
@@ -1014,6 +1016,16 @@ status_t convertMetaDataToMessage( 
        msg->setInt32("dvb-audio-description", dvbAudioDescription);

    }



    int32_t dvbTeletextMagazineNumber = 0;

    if (meta->findInt32(kKeyDvbTeletextMagazineNumber, &dvbTeletextMagazineNumber)) {

        msg->setInt32("dvb-teletext-magazine-number", dvbTeletextMagazineNumber);

    }



    int32_t dvbTeletextPageNumber = 0;

    if (meta->findInt32(kKeyDvbTeletextPageNumber, &dvbTeletextPageNumber)) {

        msg->setInt32("dvb-teletext-page-number", dvbTeletextPageNumber);

    }



    const char *lang;

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

        msg->setString("language", lang);
@@ -1810,6 +1822,16 @@ status_t convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
        meta->setInt32(kKeyDvbAudioDescription, dvbAudioDescription);

    }



    int32_t dvbTeletextMagazineNumber = 0;

    if (msg->findInt32("dvb-teletext-magazine-number", &dvbTeletextMagazineNumber)) {

        meta->setInt32(kKeyDvbTeletextMagazineNumber, dvbTeletextMagazineNumber);

    }



    int32_t dvbTeletextPageNumber = 0;

    if (msg->findInt32("dvb-teletext-page-number", &dvbTeletextPageNumber)) {

        meta->setInt32(kKeyDvbTeletextPageNumber, dvbTeletextPageNumber);

    }



    AString lang;

    if (msg->findString("language", &lang)) {

        meta->setCString(kKeyMediaLanguage, lang.c_str());

media/libstagefright/include/media/stagefright/MetaDataBase.h

+6 −0
Original line number Diff line number Diff line
@@ -283,6 +283,12 @@ enum { 
    // DVB audio description

    kKeyDvbAudioDescription = 'addt', // bool (int32_t), DVB audio description only defined for

                                      // audio component



    // DVB teletext magazine number

    kKeyDvbTeletextMagazineNumber = 'ttxm', // int32_t, DVB teletext magazine number



    // DVB teletext page number

    kKeyDvbTeletextPageNumber = 'ttxp', // int32_t, DVB teletext page number

};



enum {