diff options
| author | Andreas Huber <andih@google.com> | 2012-08-30 10:58:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 10:58:45 -0700 |
| commit | 3c9408ff39aab2ac19886c7ead821018c7b74c08 (patch) | |
| tree | f6da0eb2934d6b7c361d494f48f60a39641176ee /media | |
| parent | 37265bf8e8b9a85920eb6504a20d41ef7aa58972 (diff) | |
| parent | f26d50020aa15ff8b54f3b39a626b68119793c93 (diff) | |
| download | frameworks_av-3c9408ff39aab2ac19886c7ead821018c7b74c08.zip frameworks_av-3c9408ff39aab2ac19886c7ead821018c7b74c08.tar.gz frameworks_av-3c9408ff39aab2ac19886c7ead821018c7b74c08.tar.bz2 | |
am 3b30e72d: am 546436a4: Merge "Transmit frames at a higher frame rate for smoother updates, increase" into jb-mr1-dev
* commit '3b30e72d5013cd89bff20852e9ff55eb0f5d6ad9':
Transmit frames at a higher frame rate for smoother updates, increase
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/source/Converter.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 655fbae..ee05e45 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -86,8 +86,8 @@ status_t Converter::initEncoder() { if (isAudio) { mOutputFormat->setInt32("bitrate", 64000); // 64 kBit/sec } else { - mOutputFormat->setInt32("bitrate", 3000000); // 3Mbit/sec - mOutputFormat->setInt32("frame-rate", 30); + mOutputFormat->setInt32("bitrate", 5000000); // 5Mbit/sec + mOutputFormat->setInt32("frame-rate", 60); mOutputFormat->setInt32("i-frame-interval", 3); // Iframes every 3 secs } diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 6b42431..53d27c1 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -624,7 +624,7 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { ssize_t index = mSerializer->addSource(source); #else ssize_t index = mSerializer->addSource( - new RepeaterSource(source, 30.0 /* rateHz */)); + new RepeaterSource(source, 55.0 /* rateHz */)); #endif CHECK_GE(index, 0); |