1 files changed, 6 insertions, 8 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index d23a9e2..9136d47 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -608,14 +608,6 @@ bool NuPlayer::Decoder::handleAnOutputBuffer(
     reply->setSize("buffer-ix", index);
     reply->setInt32("generation", mBufferGeneration);
 
-    if ((flags & MediaCodec::BUFFER_FLAG_DATACORRUPT) &&
-            AVNuUtils::get()->dropCorruptFrame()) {
-        ALOGV("[%s] dropping corrupt buffer at time %lld as requested.",
-                     mComponentName.c_str(), (long long)timeUs);
-        reply->post();
-        return true;
-    }
-
     if (eos) {
         ALOGI("[%s] saw output EOS", mIsAudio ? "audio" : "video");
 
@@ -631,6 +623,12 @@ bool NuPlayer::Decoder::handleAnOutputBuffer(
         }
 
         mSkipRenderingUntilMediaTimeUs = -1;
+    } else if ((flags & MediaCodec::BUFFER_FLAG_DATACORRUPT) &&
+            AVNuUtils::get()->dropCorruptFrame()) {
+        ALOGV("[%s] dropping corrupt buffer at time %lld as requested.",
+                     mComponentName.c_str(), (long long)timeUs);
+        reply->post();
+        return true;
     }
 
     mNumFramesTotal += !mIsAudio;