summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-01 13:39:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-01 13:39:27 -0700
commit412fc7cdb6a1c4b6afe85b58fcc794fd67271942 (patch)
treed14f92ca24fc4836980b6d61de9a112d0e9a0ccd /media
parentde2b1615d27881d98f483fc9158497fbe1fc5f8d (diff)
parent27b9c8ec168f0b26a663960c6ee6fb973265d195 (diff)
downloadframeworks_base-412fc7cdb6a1c4b6afe85b58fcc794fd67271942.zip
frameworks_base-412fc7cdb6a1c4b6afe85b58fcc794fd67271942.tar.gz
frameworks_base-412fc7cdb6a1c4b6afe85b58fcc794fd67271942.tar.bz2
Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/rtsp/ARTPSession.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTPSession.cpp b/media/libstagefright/rtsp/ARTPSession.cpp
index f60c1a9..8ce93b7 100644
--- a/media/libstagefright/rtsp/ARTPSession.cpp
+++ b/media/libstagefright/rtsp/ARTPSession.cpp
@@ -125,6 +125,14 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) {
switch (msg->what()) {
case kWhatAccessUnitComplete:
{
+ int32_t firstRTCP;
+ if (msg->findInt32("first-rtcp", &firstRTCP)) {
+ // There won't be an access unit here, it's just a notification
+ // that the data communication worked since we got the first
+ // rtcp packet.
+ break;
+ }
+
size_t trackIndex;
CHECK(msg->findSize("track-index", &trackIndex));