Merge "camera3: Don't eagerly finish configuring bidi streams more than once" into jb-mr2-dev (ef33d308) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/Camera3Device.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -1060,7 +1060,7 @@ status_t Camera3Device::configureStreamsLocked() {
		// TODO: Try to relax this later back to lazy completion, which should be
		// faster

		if (mInputStream != NULL) {
		if (mInputStream != NULL && mInputStream->isConfiguring()) {
		res = mInputStream->finishConfiguration(mHal3Device);
		if (res != OK) {
		SET_ERR_L("Can't finish configuring input stream %d: %s (%d)",
		@@ -1070,13 +1070,17 @@ status_t Camera3Device::configureStreamsLocked() {
		}

		for (size_t i = 0; i < mOutputStreams.size(); i++) {
		res = mOutputStreams.editValueAt(i)->finishConfiguration(mHal3Device);
		sp<Camera3OutputStreamInterface> outputStream =
		mOutputStreams.editValueAt(i);
		if (outputStream->isConfiguring()) {
		res = outputStream->finishConfiguration(mHal3Device);
		if (res != OK) {
		SET_ERR_L("Can't finish configuring output stream %d: %s (%d)",
		mOutputStreams[i]->getId(), strerror(-res), res);
		outputStream->getId(), strerror(-res), res);
		return res;
		}
		}
		}

		// Request thread needs to know to avoid using repeat-last-settings protocol
		// across configure_streams() calls