Merge "Camera: delete preview callback when preview size is changed" (4bbf8ea1) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/Camera2Client.cpp

+16 −0

Original line number	Diff line number	Diff line
		@@ -731,6 +731,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
		return OK;
		}
		params.state = Parameters::STOPPED;
		int lastPreviewStreamId = mStreamingProcessor->getPreviewStreamId();

		res = mStreamingProcessor->updatePreviewStream(params);
		if (res != OK) {
		@@ -739,6 +740,8 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
		return res;
		}

		bool previewStreamChanged = mStreamingProcessor->getPreviewStreamId() != lastPreviewStreamId;

		// We could wait to create the JPEG output stream until first actual use
		// (first takePicture call). However, this would substantially increase the
		// first capture latency on HAL3 devices, and potentially on some HAL2
		@@ -788,6 +791,19 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
		return res;
		}
		outputStreams.push(getCallbackStreamId());
		} else if (previewStreamChanged && mCallbackProcessor->getStreamId() != NO_STREAM) {
		/**
		* Delete the unused callback stream when preview stream is changed and
		* preview is not enabled. Don't need stop preview stream as preview is in
		* STOPPED state now.
		*/
		ALOGV("%s: Camera %d: Delete unused preview callback stream.", __FUNCTION__, mCameraId);
		res = mCallbackProcessor->deleteStream();
		if (res != OK) {
		ALOGE("%s: Camera %d: Unable to delete callback stream %s (%d)",
		__FUNCTION__, mCameraId, strerror(-res), res);
		return res;
		}
		}
		if (params.zslMode && !params.recordingHint) {
		res = updateProcessorStream(mZslProcessor, params);