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

Commit 63563da8 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless... 

am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev

* commit 'fa3df4ad':
  Fix adaptive frame rate handling to be non-adaptive unless specified through
parents b41c9a03 fa3df4ad

media/libstagefright/wifi-display/source/PlaybackSession.cpp

+5 −2
Original line number Diff line number Diff line
@@ -709,7 +709,10 @@ void WifiDisplaySource::PlaybackSession::onSinkFeedback(const sp<AMessage> &msg) 
                Converter::GetInt32Property(

                        "media.wfd.video-framerate", -1);



            if (rateHz < 0.0) {

            char val[PROPERTY_VALUE_MAX];

            if (rateHz < 0.0

                    && property_get("media.wfd.video-framerate", val, NULL)

                    && !strcasecmp("adaptive", val)) {

                 rateHz = repeaterSource->getFrameRate();



                if (avgLatencyUs > 300000ll) {