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

Commit 5259aaac authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am c4706396: Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev 

* commit 'c4706396':
  stagefright: only pass valid framerates in msg and meta
parents 49d1087f c4706396

media/libstagefright/Utils.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ status_t convertMetaDataToMessage( 
    }

    }





    int32_t fps;

    int32_t fps;

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

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

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

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

    }

    }
@@ -664,7 +664,7 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
    }

    }





    int32_t fps;

    int32_t fps;

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

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

        meta->setInt32(kKeyFrameRate, fps);

        meta->setInt32(kKeyFrameRate, fps);

    }

    }