Merge "Release the mutex before calling hidl_cb" into oc-dr1-dev (c06dd405) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/1.0/Omx.cpp

+38 −35

Original line number	Diff line number	Diff line
		@@ -90,13 +90,15 @@ Return<void> Omx::allocateNode(
		using ::android::IOMXNode;
		using ::android::IOMXObserver;

		sp<OMXNodeInstance> instance;
		{
		Mutex::Autolock autoLock(mLock);
		if (mLiveNodes.size() == kMaxNodeInstances) {
		_hidl_cb(toStatus(NO_MEMORY), nullptr);
		return Void();
		}

		sp<OMXNodeInstance> instance = new OMXNodeInstance(
		instance = new OMXNodeInstance(
		this, new LWOmxObserver(observer), name.c_str());

		OMX_COMPONENTTYPE *handle;
		@@ -128,8 +130,9 @@ Return<void> Omx::allocateNode(
		}

		mLiveNodes.add(observer.get(), instance);
		observer->linkToDeath(this, 0);
		mNode2Observer.add(instance.get(), observer.get());
		}
		observer->linkToDeath(this, 0);

		_hidl_cb(toStatus(OK), new TWOmxNode(instance));
		return Void();