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
commitbcbe5af62aad9d1ef64f799fcde58ac9a8adace8 (patch)
tree7f28936b13ecbea2c4a72452f50a3dc2e825b264 /media
parent82f7321b03eec1e40af9d681370f754ee0279582 (diff)
parent389636ce967af15e72817e2133907a2cb2efd1ae (diff)
downloadframeworks_av-bcbe5af62aad9d1ef64f799fcde58ac9a8adace8.zip
frameworks_av-bcbe5af62aad9d1ef64f799fcde58ac9a8adace8.tar.gz
frameworks_av-bcbe5af62aad9d1ef64f799fcde58ac9a8adace8.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));