diff options
| author | Andreas Huber <andih@google.com> | 2013-04-04 10:48:50 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-04-04 10:48:50 -0700 |
| commit | 80bf5cc27e8f3347897aa29a9c16d7ee83577df2 (patch) | |
| tree | 2647d804f20eceea5ad5d0c092f467589e38f4c8 /media/libstagefright/wifi-display | |
| parent | 8344844311b852ea7321e914642bd9e57e0d5fb0 (diff) | |
| download | frameworks_av-80bf5cc27e8f3347897aa29a9c16d7ee83577df2.zip frameworks_av-80bf5cc27e8f3347897aa29a9c16d7ee83577df2.tar.gz frameworks_av-80bf5cc27e8f3347897aa29a9c16d7ee83577df2.tar.bz2 | |
Fix adaptive frame rate handling to be non-adaptive unless specified through
adb shell setprop media.wfd.video-framerate adaptive
Change-Id: I452576b62ad465680232b40464977e126616df18
Diffstat (limited to 'media/libstagefright/wifi-display')
| -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; |