Merge "Camera: Clear available callback buffers during recording stop" into oc-dev (7d25f0f5) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/CameraClient.cpp

+15 −6

Original line number	Diff line number	Diff line
		@@ -478,6 +478,7 @@ void CameraClient::stopPreview() {
		// stop recording mode
		void CameraClient::stopRecording() {
		LOG1("stopRecording (pid %d)", getCallingPid());
		{
		Mutex::Autolock lock(mLock);
		if (checkPidAndHardware() != NO_ERROR) return;

		@@ -488,6 +489,14 @@ void CameraClient::stopRecording() {
		mPreviewBuffer.clear();
		}

		{
		Mutex::Autolock l(mAvailableCallbackBuffersLock);
		if (!mAvailableCallbackBuffers.empty()) {
		mAvailableCallbackBuffers.clear();
		}
		}
		}

		// release a recording frame
		void CameraClient::releaseRecordingFrame(const sp<IMemory>& mem) {
		Mutex::Autolock lock(mLock);