diff options
| author | Andreas Huber <andih@google.com> | 2012-09-26 14:30:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 14:46:40 -0700 |
| commit | 72ff5903df5f409ea83f74c363a52f0745ced8b8 (patch) | |
| tree | 2a1322c40f2c07ac29eef61b66170c5698e0c218 | |
| parent | 5895c5db5caa6b1e3e415716269947755506859e (diff) | |
| download | frameworks_av-72ff5903df5f409ea83f74c363a52f0745ced8b8.zip frameworks_av-72ff5903df5f409ea83f74c363a52f0745ced8b8.tar.gz frameworks_av-72ff5903df5f409ea83f74c363a52f0745ced8b8.tar.bz2 | |
720p24 i-frames every 2 secs.
related-to-bug: 7239971
Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc
3 files changed, 6 insertions, 4 deletions
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index a979a42..d2158b3 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -124,8 +124,8 @@ status_t Converter::initEncoder() { mOutputFormat->setInt32("bitrate", audioBitrate); } else { mOutputFormat->setInt32("bitrate", videoBitrate); - mOutputFormat->setInt32("frame-rate", 30); - mOutputFormat->setInt32("i-frame-interval", 3); // Iframes every 3 secs + mOutputFormat->setInt32("frame-rate", 24); + mOutputFormat->setInt32("i-frame-interval", 2); // Iframes every 2 secs } ALOGV("output format is '%s'", mOutputFormat->debugString(0).c_str()); diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 72e6313..76a47ec 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -863,7 +863,7 @@ status_t WifiDisplaySource::PlaybackSession::addVideoSource() { sp<SurfaceMediaSource> source = new SurfaceMediaSource(width(), height()); sp<MediaSource> videoSource = - new RepeaterSource(source, 30.0 /* rateHz */); + new RepeaterSource(source, 24.0 /* rateHz */); size_t numInputBuffers; status_t err = addSource(true /* isVideo */, videoSource, &numInputBuffers); diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index daa70f6..b9139c9 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -471,9 +471,11 @@ status_t WifiDisplaySource::sendM4(int32_t sessionID) { // use "30 00 02 02 00000040 00000000 00000000 00 0000 0000 00 none none\r\n" // For 720p30: // use "28 00 02 02 00000020 00000000 00000000 00 0000 0000 00 none none\r\n" + // For 720p24: + // use "78 00 02 02 00008000 00000000 00000000 00 0000 0000 00 none none\r\n" AString body = StringPrintf( "wfd_video_formats: " - "28 00 02 02 00000020 00000000 00000000 00 0000 0000 00 none none\r\n" + "78 00 02 02 00008000 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:%d/wfd1.0/streamid=0 none\r\n" "wfd_client_rtp_ports: RTP/AVP/%s;unicast 19000 0 mode=play\r\n", |