1 files changed, 29 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index 35567a5..4962520 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -24,6 +24,7 @@
 #include "MyHandler.h"
 #include "SDPLoader.h"
 
+#include <cutils/properties.h>
 #include <media/IMediaHTTPService.h>
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MetaData.h>
@@ -32,6 +33,7 @@
 namespace android {
 
 const int64_t kNearEOSTimeoutUs = 2000000ll; // 2 secs
+const uint32_t kMaxNumKeepDamagedAccessUnits = 30;
 
 NuPlayer::RTSPSource::RTSPSource(
         const sp<AMessage> &notify,
@@ -54,7 +56,10 @@ NuPlayer::RTSPSource::RTSPSource(
       mBuffering(false),
       mSeekGeneration(0),
       mEOSTimeoutAudio(0),
-      mEOSTimeoutVideo(0) {
+      mEOSTimeoutVideo(0),
+      mVideoTrackIndex(-1),
+      mKeepDamagedAccessUnits(false),
+      mNumKeepDamagedAccessUnits(0) {
     if (headers) {
         mExtraHeaders = *headers;
 
@@ -433,11 +438,22 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) {
             sp<ABuffer> accessUnit;
             CHECK(msg->findBuffer("accessUnit", &accessUnit));
 
+            bool isVideo = trackIndex == (size_t)mVideoTrackIndex;
             int32_t damaged;
             if (accessUnit->meta()->findInt32("damaged", &damaged)
                     && damaged) {
-                ALOGI("dropping damaged access unit.");
-                break;
+                if (isVideo && mKeepDamagedAccessUnits
+                        && mNumKeepDamagedAccessUnits < kMaxNumKeepDamagedAccessUnits) {
+                    ALOGI("keep a damaged access unit.");
+                    ++mNumKeepDamagedAccessUnits;
+                } else {
+                    ALOGI("dropping damaged access unit.");
+                    break;
+                }
+            } else {
+                if (isVideo) {
+                    mNumKeepDamagedAccessUnits = 0;
+                }
             }
 
             if (mTSParser != NULL) {
@@ -613,6 +629,16 @@ void NuPlayer::RTSPSource::onConnected() {
         bool isAudio = !strncasecmp(mime, "audio/", 6);
         bool isVideo = !strncasecmp(mime, "video/", 6);
 
+        if (isVideo) {
+            mVideoTrackIndex = i;
+            char value[PROPERTY_VALUE_MAX];
+            if (property_get("rtsp.video.keep-damaged-au", value, NULL)
+                    && !strcasecmp(mime, value)) {
+                ALOGV("enable to keep damaged au for %s", mime);
+                mKeepDamagedAccessUnits = true;
+            }
+        }
+
         TrackInfo info;
         info.mTimeScale = timeScale;
         info.mRTPTime = 0;