From 3684ae89c9baa229f5a988406d27a5931a5e0556 Mon Sep 17 00:00:00 2001
From: Shalaj Jain <shalajj@codeaurora.org>
Date: Fri, 9 Oct 2015 17:32:58 -0700
Subject: nuplayer: handle error from MediaCodec in Decoder
 handleAnOutputBuffer

MediaCodec could send out message of output buffer available right before
it hits an error and clears its buffers.

Change-Id: I1b11c88cdcb3fca7ddd6103c6d3d28642304f079
---
 media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')

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();
-- 
cgit v1.1