summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-01 13:45:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-01 13:45:30 -0700
commit56f2c6e529bc62d55fc8baa7d1b52326307474d4 (patch)
tree02958abbfd19bf49e1235955bd20431cdd3b878e /media/libstagefright/rtsp
parent8852dbbdf3ceda01a96f3c8a814822e224239494 (diff)
parent002b34c3f56932fa472ee4a9fd47a8b021a27b1a (diff)
downloadframeworks_av-56f2c6e529bc62d55fc8baa7d1b52326307474d4.zip
frameworks_av-56f2c6e529bc62d55fc8baa7d1b52326307474d4.tar.gz
frameworks_av-56f2c6e529bc62d55fc8baa7d1b52326307474d4.tar.bz2
am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96' * commit '47f2cf620731226a9311db0f864a4e1404e54b96': Keep gtalk video chat specific code consistent with rtsp changes.
Diffstat (limited to 'media/libstagefright/rtsp')
-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));