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

Commit e9a3d2d7 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android Git Automerger
Browse files

am 9269b9ba: am d707ac5a: Merge "libstagefright: add xml parsing for... 

am 9269b9ba: am d707ac5a: Merge "libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second." into mnc-dev

* commit '9269b9ba':
  libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second.
parents bfede708 9269b9ba

media/libstagefright/MediaCodecList.cpp

+4 −2
Original line number Diff line number Diff line
@@ -886,14 +886,16 @@ status_t MediaCodecList::addLimit(const char **attrs) { 
        return -EINVAL;

    }



    // size, blocks, bitrate, frame-rate, blocks-per-second, aspect-ratio: range

    // size, blocks, bitrate, frame-rate, blocks-per-second, aspect-ratio,

    // measured-frame-rate, measured-blocks-per-second: range

    // quality: range + default + [scale]

    // complexity: range + default

    bool found;



    if (name == "aspect-ratio" || name == "bitrate" || name == "block-count"

            || name == "blocks-per-second" || name == "complexity"

            || name == "frame-rate" || name == "quality" || name == "size") {

            || name == "frame-rate" || name == "quality" || name == "size"

            || name == "measured-blocks-per-second" || name == "measured-frame-rate") {

        AString min, max;

        if (msg->findString("min", &min) && msg->findString("max", &max)) {

            min.append("-");