am b9c0bd8a: am cc27e117: Camera: Save 1 frame time for takePicture call (f1a968c4) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#define LOG_TAG "Camera2"
		#define LOG_TAG "Camera2Client"
		#define ATRACE_TAG ATRACE_TAG_CAMERA
		//#define LOG_NDEBUG 0

+8 −9

Original line number	Diff line number	Diff line
		@@ -1910,6 +1910,14 @@ bool Camera3Device::RequestThread::threadLoop() {
		return false;
		}

		// Inform waitUntilRequestProcessed thread of a new request ID
		{
		Mutex::Autolock al(mLatestRequestMutex);

		mLatestRequestId = requestId;
		mLatestRequestSignal.signal();
		}

		// Submit request and block until ready for next one
		ATRACE_ASYNC_BEGIN("frame capture", request.frame_number);
		ATRACE_BEGIN("camera3->process_capture_request");
		@@ -1945,15 +1953,6 @@ bool Camera3Device::RequestThread::threadLoop() {
		}
		mPrevTriggers = triggerCount;

		// Read android.request.id from the request settings metadata
		// - inform waitUntilRequestProcessed thread of a new request ID
		{
		Mutex::Autolock al(mLatestRequestMutex);

		mLatestRequestId = requestId;
		mLatestRequestSignal.signal();
		}

		// Return input buffer back to framework
		if (request.input_buffer != NULL) {
		Camera3Stream *stream =

+1 −0

Original line number	Diff line number	Diff line
		@@ -457,6 +457,7 @@ class Camera3Device :
		InFlightRequest(int id, int numBuffers) :
		requestId(id),
		captureTimestamp(0),
		requestStatus(OK),
		haveResultMetadata(false),
		numBuffersLeft(numBuffers) {
		}