diff options
author | Andreas Huber <andih@google.com> | 2012-11-15 12:48:41 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-15 12:48:42 -0800 |
commit | 7d9c126be8dfe3016683eeb2b7a2d88ba5b24c0b (patch) | |
tree | 393387596b3a41ca5441f18f7d8475fd8176f2e5 /media | |
parent | 5ce181568da90c78ba7fad3e084c8479041545df (diff) | |
parent | 22d00b70516f108c3351a29c95d8ba639a8ed520 (diff) | |
download | frameworks_av-7d9c126be8dfe3016683eeb2b7a2d88ba5b24c0b.zip frameworks_av-7d9c126be8dfe3016683eeb2b7a2d88ba5b24c0b.tar.gz frameworks_av-7d9c126be8dfe3016683eeb2b7a2d88ba5b24c0b.tar.bz2 |
Merge "wfd sink update."
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/wifi-display/sink/TunnelRenderer.cpp | 5 | ||||
-rw-r--r-- | media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/media/libstagefright/wifi-display/sink/TunnelRenderer.cpp b/media/libstagefright/wifi-display/sink/TunnelRenderer.cpp index bc35aef..b913124 100644 --- a/media/libstagefright/wifi-display/sink/TunnelRenderer.cpp +++ b/media/libstagefright/wifi-display/sink/TunnelRenderer.cpp @@ -271,6 +271,7 @@ sp<ABuffer> TunnelRenderer::dequeueBuffer() { if (mFirstFailedAttemptUs + 50000ll > ALooper::GetNowUs()) { // We're willing to wait a little while to get the right packet. +#if 0 if (!mRequestedRetransmission) { ALOGI("requesting retransmission of seqNo %d", (mLastDequeuedExtSeqNo + 1) & 0xffff); @@ -280,7 +281,9 @@ sp<ABuffer> TunnelRenderer::dequeueBuffer() { notify->post(); mRequestedRetransmission = true; - } else { + } else +#endif + { ALOGI("still waiting for the correct packet to arrive."); } diff --git a/media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp b/media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp index fcd20d4..c3e0470 100644 --- a/media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp +++ b/media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp @@ -475,9 +475,10 @@ void WifiDisplaySink::onGetParameterRequest( int32_t cseq, const sp<ParsedMessage> &data) { AString body = - "wfd_video_formats: xxx\r\n" - "wfd_audio_codecs: xxx\r\n" - "wfd_client_rtp_ports: RTP/AVP/UDP;unicast xxx 0 mode=play\r\n"; + "wfd_video_formats: " + "28 00 02 02 FFFFFFFF 0000000 00000000 00 0000 0000 00 none none\r\n" + "wfd_audio_codecs: AAC 0000000F 00\r\n" + "wfd_client_rtp_ports: RTP/AVP/UDP;unicast 19000 0 mode=play\r\n"; AString response = "RTSP/1.0 200 OK\r\n"; AppendCommonResponse(&response, cseq); |