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

Commit 5f88cdae authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev

parents eaa34703 8f5919da

media/libstagefright/Utils.cpp

+10 −0
Original line number Diff line number Diff line
@@ -181,6 +181,11 @@ status_t convertMetaDataToMessage( 
        msg->setInt32("rotation-degrees", rotationDegrees);

    }



    int32_t fps;

    if (meta->findInt32(kKeyFrameRate, &fps)) {

        msg->setInt32("frame-rate", fps);

    }



    uint32_t type;

    const void *data;

    size_t size;
@@ -588,6 +593,11 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
        meta->setInt32(kKeyMaxHeight, maxHeight);

    }



    int32_t fps;

    if (msg->findInt32("frame-rate", &fps)) {

        meta->setInt32(kKeyFrameRate, fps);

    }



    // reassemble the csd data into its original form

    sp<ABuffer> csd0;

    if (msg->findBuffer("csd-0", &csd0)) {