diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-12 20:08:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-12 20:08:53 -0700 |
| commit | 6c519b0663ff4df0daceb2670120b431791212bc (patch) | |
| tree | e09f07cdeb915328e8231a4443dda70293230d21 /media/libmediaplayerservice | |
| parent | 0aeb8e22fed35a28534211e073edb7d80413d8cb (diff) | |
| parent | 3684ae89c9baa229f5a988406d27a5931a5e0556 (diff) | |
| download | frameworks_av-6c519b0663ff4df0daceb2670120b431791212bc.zip frameworks_av-6c519b0663ff4df0daceb2670120b431791212bc.tar.gz frameworks_av-6c519b0663ff4df0daceb2670120b431791212bc.tar.bz2 | |
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 27650d7..f83eaf6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -565,6 +565,11 @@ bool NuPlayer::Decoder::handleAnOutputBuffer( sp<ABuffer> buffer; mCodec->getOutputBuffer(index, &buffer); + if (buffer == NULL) { + handleError(UNKNOWN_ERROR); + return false; + } + if (index >= mOutputBuffers.size()) { for (size_t i = mOutputBuffers.size(); i <= index; ++i) { mOutputBuffers.add(); |