diff options
| author | Andreas Huber <andih@google.com> | 2012-10-01 17:23:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-01 17:23:15 -0700 |
| commit | 9fbc2902346add6f9febb0b139484d07080ee0ad (patch) | |
| tree | 83c64221f0704e7632e4da6ec72cb8150eaacb43 /media | |
| parent | 9fab80cfc06d7b68eaf825aee62c3f823a5dba32 (diff) | |
| parent | 4456b26b5a76de3b488b777cee0a72f61027d873 (diff) | |
| download | frameworks_av-9fbc2902346add6f9febb0b139484d07080ee0ad.zip frameworks_av-9fbc2902346add6f9febb0b139484d07080ee0ad.tar.gz frameworks_av-9fbc2902346add6f9febb0b139484d07080ee0ad.tar.bz2 | |
am 008d15d3: am ee178668: Use incremental updates sent by surface flinger
* commit '008d15d307f3e35f5580fe03470974f7193c952b':
Use incremental updates sent by surface flinger
Diffstat (limited to 'media')
3 files changed, 5 insertions, 7 deletions
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 99db060..60cca69 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -132,7 +132,7 @@ status_t Converter::initEncoder() { mOutputFormat->setInt32("bitrate", audioBitrate); } else { mOutputFormat->setInt32("bitrate", videoBitrate); - mOutputFormat->setInt32("frame-rate", 24); + mOutputFormat->setInt32("frame-rate", 60); mOutputFormat->setInt32("i-frame-interval", 1); // Iframes every 1 secs // mOutputFormat->setInt32("prepend-sps-pps-to-idr-frames", 1); } diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 7fce133..7de607c 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -267,7 +267,7 @@ WifiDisplaySource::PlaybackSession::PlaybackSession( mSendSRPending(false), mHistoryLength(0) #if TRACK_BANDWIDTH - ,mFirstPacketTimeUs(-1ll), + ,mFirstPacketTimeUs(-1ll) ,mTotalBytesSent(0ll) #endif #if LOG_TRANSPORT_STREAM @@ -885,10 +885,8 @@ status_t WifiDisplaySource::PlaybackSession::addVideoSource() { source->setUseAbsoluteTimestamps(); - sp<MediaSource> videoSource = new RepeaterSource(source, 24.0f); - size_t numInputBuffers; - status_t err = addSource(true /* isVideo */, videoSource, &numInputBuffers); + status_t err = addSource(true /* isVideo */, source, &numInputBuffers); if (err != OK) { return err; @@ -1122,7 +1120,7 @@ ssize_t WifiDisplaySource::PlaybackSession::appendTSData( int64_t delayUs = ALooper::GetNowUs() - mFirstPacketTimeUs; if (delayUs > 0ll) { - ALOGV("approx. net bandwidth used: %.2f Mbit/sec", + ALOGI("approx. net bandwidth used: %.2f Mbit/sec", mTotalBytesSent * 8.0 / delayUs); } #endif diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index 4c2b457..1083a80 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -539,7 +539,7 @@ status_t WifiDisplaySource::sendM4(int32_t sessionID) { // use "78 00 02 02 00008000 00000000 00000000 00 0000 0000 00 none none\r\n" AString body = StringPrintf( "wfd_video_formats: " - "78 00 02 02 00008000 00000000 00000000 00 0000 0000 00 none none\r\n" + "30 00 02 02 00000040 00000000 00000000 00 0000 0000 00 none none\r\n" "wfd_audio_codecs: AAC 00000001 00\r\n" // 2 ch AAC 48kHz "wfd_presentation_URL: rtsp://%s/wfd1.0/streamid=0 none\r\n" "wfd_client_rtp_ports: RTP/AVP/%s;unicast 19000 0 mode=play\r\n", |