| commit | 3249558196082087fb8bd0a847ef5c6000c8b925 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Wed Apr 15 21:19:32 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 15 21:19:33 2015 +0000 |
| tree | 4096aacaa52e6ff8fde1d06eebc6da927816e41d | |
| parent | cfdd52423cee9efea73023feeaa74279ebd45b7c [diff] | |
| parent | 43cc944ecdc1634dccd92a1aad559f0caa13b53c [diff] |
Merge "fix NuPlayerDecoder discontinuity handling with async mode"
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 3fff1e6..d521c64 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -463,10 +463,6 @@ size_t size, int64_t timeUs, int32_t flags) { - if (mFormatChangePending) { - return false; - } - // CHECK_LT(bufferIx, mOutputBuffers.size()); sp<ABuffer> buffer; mCodec->getOutputBuffer(index, &buffer);