am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread

Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp

* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
  Keep gtalk video chat specific code consistent with rtsp changes.

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));