Commit 4e7855e9 authored Sep 13, 2017 by Wonsik Kim Committed by android-build-merger Sep 13, 2017

Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer"...

Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2 am: 18b22afe am: e4222798 am: f669386f am: af6aa6e3 am: 773023dd
am: 29cd6b30

Change-Id: I5dbd868f25eb1b135e58ea9b5031fdb80da9a1f3

parents 04cb1d7f 29cd6b30

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -631,6 +631,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();