diff options
| author | Andreas Huber <andih@google.com> | 2013-04-04 18:09:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-04 18:09:04 +0000 |
| commit | fa3df4ad35da6528ab5620d4f596c60d8cd99110 (patch) | |
| tree | 8afc6276c892629ce2d7cfab179287045fa74663 /media | |
| parent | a5761dcb5f9f017ca9b83ec868565d7ce54a92ac (diff) | |
| parent | 5340cef8c137e7002ff196f2b88b508675bd5b24 (diff) | |
| download | frameworks_av-fa3df4ad35da6528ab5620d4f596c60d8cd99110.zip frameworks_av-fa3df4ad35da6528ab5620d4f596c60d8cd99110.tar.gz frameworks_av-fa3df4ad35da6528ab5620d4f596c60d8cd99110.tar.bz2 | |
Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 715d0b5..cacfcca 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -709,8 +709,11 @@ void WifiDisplaySource::PlaybackSession::onSinkFeedback(const sp<AMessage> &msg) Converter::GetInt32Property( "media.wfd.video-framerate", -1); - if (rateHz < 0.0) { - rateHz = repeaterSource->getFrameRate(); + 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) { rateHz *= 0.9; |