Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us." into mnc-dev (14ae2c0d) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -1063,11 +1063,13 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() {

		for (OMX_U32 i = cancelStart; i < cancelEnd; i++) {
		BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i);
		if (info->mStatus == BufferInfo::OWNED_BY_US) {
		status_t error = cancelBufferToNativeWindow(info);
		if (err == 0) {
		err = error;
		}
		}
		}

		if (!storingMetadataInDecodedBuffers()) {
		static_cast<Surface*>(mNativeWindow.get())
		@@ -1152,11 +1154,13 @@ status_t ACodec::allocateOutputMetadataBuffers() {

		for (OMX_U32 i = 0; i < mBuffers[kPortIndexOutput].size(); i++) {
		BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i);
		if (info->mStatus == BufferInfo::OWNED_BY_US) {
		status_t error = cancelBufferToNativeWindow(info);
		if (err == OK) {
		err = error;
		}
		}
		}

		static_cast<Surface*>(mNativeWindow.get())
		->getIGraphicBufferProducer()->allowAllocation(false);