NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. (56097a8e) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -525,7 +525,10 @@ bool NuPlayer::Decoder::handleAnInputBuffer(size_t index) {
		ALOGI("[%s] resubmitting CSD", mComponentName.c_str());
		msg->setBuffer("buffer", buffer);
		mCSDsToSubmit.removeAt(0);
		CHECK(onInputBufferFetched(msg));
		if (!onInputBufferFetched(msg)) {
		handleError(UNKNOWN_ERROR);
		return false;
		}
		return true;
		}

		@@ -862,7 +865,11 @@ bool NuPlayer::Decoder::onInputBufferFetched(const sp<AMessage> &msg) {

		// copy into codec buffer
		if (buffer != codecBuffer) {
		CHECK_LE(buffer->size(), codecBuffer->capacity());
		if (buffer->size() > codecBuffer->capacity()) {
		handleError(ERROR_BUFFER_TOO_SMALL);
		mDequeuedInputBuffers.push_back(bufferIx);
		return false;
		}
		codecBuffer->setRange(0, buffer->size());
		memcpy(codecBuffer->data(), buffer->data(), buffer->size());
		}