summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-11-15 11:16:30 -0800
committerAndreas Huber <andih@google.com>2012-11-15 11:16:30 -0800
commit22d00b70516f108c3351a29c95d8ba639a8ed520 (patch)
treee0c9a7bdc378ece559e4e7cc3013364aeb327c00
parent7e900282f04844b723986fa51b72f61a80e05c2f (diff)
downloadframeworks_av-22d00b70516f108c3351a29c95d8ba639a8ed520.zip
frameworks_av-22d00b70516f108c3351a29c95d8ba639a8ed520.tar.gz
frameworks_av-22d00b70516f108c3351a29c95d8ba639a8ed520.tar.bz2
wfd sink update.
Change-Id: Ib4e41ec1524d045699543536acdddc9a243db741
-rw-r--r--media/libstagefright/wifi-display/sink/TunnelRenderer.cpp5
-rw-r--r--media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp7
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);