services/camera/libcameraservice/camera2/ZslProcessor3.cpp - platform/frameworks/av - Git at Google

 /*
  * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

 #define LOG_TAG "Camera2-ZslProcessor3"
 #define ATRACE_TAG ATRACE_TAG_CAMERA
 //#define LOG_NDEBUG 0
 //#define LOG_NNDEBUG 0

 #ifdef LOG_NNDEBUG
 #define ALOGVV(...) ALOGV(__VA_ARGS__)
 #else
 #define ALOGVV(...) ((void)0)
 #endif

 #include <utils/Log.h>
 #include <utils/Trace.h>

 #include "ZslProcessor3.h"
 #include <gui/Surface.h>
 #include "../CameraDeviceBase.h"
 #include "../Camera3Device.h"
 #include "../Camera2Client.h"


 namespace android {
 namespace camera2 {

 ZslProcessor3::ZslProcessor3(
     sp<Camera2Client> client,
     wp<CaptureSequencer> sequencer):
         Thread(false),
         mState(RUNNING),
         mClient(client),
         mSequencer(sequencer),
         mId(client->getCameraId()),
         mZslStreamId(NO_STREAM),
         mFrameListHead(0),
         mZslQueueHead(0),
         mZslQueueTail(0) {
     mZslQueue.insertAt(0, kZslBufferDepth);
     mFrameList.insertAt(0, kFrameListDepth);
     sp<CaptureSequencer> captureSequencer = mSequencer.promote();
     if (captureSequencer != 0) captureSequencer->setZslProcessor(this);
 }

 ZslProcessor3::~ZslProcessor3() {
     ALOGV("%s: Exit", __FUNCTION__);
     deleteStream();
 }

 void ZslProcessor3::onFrameAvailable(int32_t /*frameId*/,
                                      const CameraMetadata &frame) {
     Mutex::Autolock l(mInputMutex);
     camera_metadata_ro_entry_t entry;
     entry = frame.find(ANDROID_SENSOR_TIMESTAMP);
     nsecs_t timestamp = entry.data.i64[0];
     (void)timestamp;
     ALOGVV("Got preview metadata for timestamp %lld", timestamp);

     if (mState != RUNNING) return;

     mFrameList.editItemAt(mFrameListHead) = frame;
     mFrameListHead = (mFrameListHead + 1) % kFrameListDepth;
 }

 status_t ZslProcessor3::updateStream(const Parameters &params) {
     ATRACE_CALL();
     ALOGV("%s: Configuring ZSL streams", __FUNCTION__);
     status_t res;

     Mutex::Autolock l(mInputMutex);

     sp<Camera2Client> client = mClient.promote();
     if (client == 0) {
         ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
         return INVALID_OPERATION;
     }
     sp<Camera3Device> device =
         static_cast<Camera3Device*>(client->getCameraDevice().get());
     if (device == 0) {
         ALOGE("%s: Camera %d: Device does not exist", __FUNCTION__, mId);
         return INVALID_OPERATION;
     }

     if (mZslStreamId != NO_STREAM) {
         // Check if stream parameters have to change
         uint32_t currentWidth, currentHeight;
         res = device->getStreamInfo(mZslStreamId,
                 &currentWidth, &currentHeight, 0);
         if (res != OK) {
             ALOGE("%s: Camera %d: Error querying capture output stream info: "
                     "%s (%d)", __FUNCTION__,
                     client->getCameraId(), strerror(-res), res);
             return res;
         }
         if (currentWidth != (uint32_t)params.fastInfo.arrayWidth ||
                 currentHeight != (uint32_t)params.fastInfo.arrayHeight) {
             ALOGV("%s: Camera %d: Deleting stream %d since the buffer "
                   "dimensions changed",
                 __FUNCTION__, client->getCameraId(), mZslStreamId);
             res = device->deleteStream(mZslStreamId);
             if (res == -EBUSY) {
                 ALOGV("%s: Camera %d: Device is busy, call updateStream again "
                       " after it becomes idle", __FUNCTION__, mId);
                 return res;
             } else if(res != OK) {
                 ALOGE("%s: Camera %d: Unable to delete old output stream "
                         "for ZSL: %s (%d)", __FUNCTION__,
                         client->getCameraId(), strerror(-res), res);
                 return res;
             }
             mZslStreamId = NO_STREAM;
         }
     }

     if (mZslStreamId == NO_STREAM) {
         // Create stream for HAL production
         // TODO: Sort out better way to select resolution for ZSL

         // Note that format specified internally in Camera3ZslStream
         res = device->createZslStream(
                 params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
                 kZslBufferDepth,
                 &mZslStreamId,
                 &mZslStream);
         if (res != OK) {
             ALOGE("%s: Camera %d: Can't create ZSL stream: "
                     "%s (%d)", __FUNCTION__, client->getCameraId(),
                     strerror(-res), res);
             return res;
         }
     }
     client->registerFrameListener(Camera2Client::kPreviewRequestIdStart,
             Camera2Client::kPreviewRequestIdEnd,
             this);

     return OK;
 }

 status_t ZslProcessor3::deleteStream() {
     ATRACE_CALL();
     status_t res;

     Mutex::Autolock l(mInputMutex);

     if (mZslStreamId != NO_STREAM) {
         sp<Camera2Client> client = mClient.promote();
         if (client == 0) {
             ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
             return INVALID_OPERATION;
         }

         sp<Camera3Device> device =
             reinterpret_cast<Camera3Device*>(client->getCameraDevice().get());
         if (device == 0) {
             ALOGE("%s: Camera %d: Device does not exist", __FUNCTION__, mId);
             return INVALID_OPERATION;
         }

         res = device->deleteStream(mZslStreamId);
         if (res != OK) {
             ALOGE("%s: Camera %d: Cannot delete ZSL output stream %d: "
                     "%s (%d)", __FUNCTION__, client->getCameraId(),
                     mZslStreamId, strerror(-res), res);
             return res;
         }

         mZslStreamId = NO_STREAM;
     }
     return OK;
 }

 int ZslProcessor3::getStreamId() const {
     Mutex::Autolock l(mInputMutex);
     return mZslStreamId;
 }

 status_t ZslProcessor3::pushToReprocess(int32_t requestId) {
     ALOGV("%s: Send in reprocess request with id %d",
             __FUNCTION__, requestId);
     Mutex::Autolock l(mInputMutex);
     status_t res;
     sp<Camera2Client> client = mClient.promote();

     if (client == 0) {
         ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
         return INVALID_OPERATION;
     }

     IF_ALOGV() {
         dumpZslQueue(-1);
     }

     size_t metadataIdx;
     nsecs_t candidateTimestamp = getCandidateTimestampLocked(&metadataIdx);

     if (candidateTimestamp == -1) {
         ALOGE("%s: Could not find good candidate for ZSL reprocessing",
               __FUNCTION__);
         return NOT_ENOUGH_DATA;
     }

     res = mZslStream->enqueueInputBufferByTimestamp(candidateTimestamp,
                                                     /*actualTimestamp*/NULL);

     if (res == mZslStream->NO_BUFFER_AVAILABLE) {
         ALOGV("%s: No ZSL buffers yet", __FUNCTION__);
         return NOT_ENOUGH_DATA;
     } else if (res != OK) {
         ALOGE("%s: Unable to push buffer for reprocessing: %s (%d)",
                 __FUNCTION__, strerror(-res), res);
         return res;
     }

     {
         CameraMetadata request = mFrameList[metadataIdx];

         // Verify that the frame is reasonable for reprocessing

         camera_metadata_entry_t entry;
         entry = request.find(ANDROID_CONTROL_AE_STATE);
         if (entry.count == 0) {
             ALOGE("%s: ZSL queue frame has no AE state field!",
                     __FUNCTION__);
             return BAD_VALUE;
         }
         if (entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_CONVERGED &&
                 entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_LOCKED) {
             ALOGV("%s: ZSL queue frame AE state is %d, need full capture",
                     __FUNCTION__, entry.data.u8[0]);
             return NOT_ENOUGH_DATA;
         }

         uint8_t requestType = ANDROID_REQUEST_TYPE_REPROCESS;
         res = request.update(ANDROID_REQUEST_TYPE,
                 &requestType, 1);
         uint8_t inputStreams[1] =
                 { static_cast<uint8_t>(mZslStreamId) };
         if (res == OK) request.update(ANDROID_REQUEST_INPUT_STREAMS,
                 inputStreams, 1);
         // TODO: Shouldn't we also update the latest preview frame?
         uint8_t outputStreams[1] =
                 { static_cast<uint8_t>(client->getCaptureStreamId()) };
         if (res == OK) request.update(ANDROID_REQUEST_OUTPUT_STREAMS,
                 outputStreams, 1);
         res = request.update(ANDROID_REQUEST_ID,
                 &requestId, 1);

         if (res != OK ) {
             ALOGE("%s: Unable to update frame to a reprocess request",
                   __FUNCTION__);
             return INVALID_OPERATION;
         }

         res = client->stopStream();
         if (res != OK) {
             ALOGE("%s: Camera %d: Unable to stop preview for ZSL capture: "
                 "%s (%d)",
                 __FUNCTION__, client->getCameraId(), strerror(-res), res);
             return INVALID_OPERATION;
         }

         // Update JPEG settings
         {
             SharedParameters::Lock l(client->getParameters());
             res = l.mParameters.updateRequestJpeg(&request);
             if (res != OK) {
                 ALOGE("%s: Camera %d: Unable to update JPEG entries of ZSL "
                         "capture request: %s (%d)", __FUNCTION__,
                         client->getCameraId(),
                         strerror(-res), res);
                 return res;
             }
         }

         mLatestCapturedRequest = request;
         res = client->getCameraDevice()->capture(request);
         if (res != OK ) {
             ALOGE("%s: Unable to send ZSL reprocess request to capture: %s"
                   " (%d)", __FUNCTION__, strerror(-res), res);
             return res;
         }

         mState = LOCKED;
     }

     return OK;
 }

 status_t ZslProcessor3::clearZslQueue() {
     Mutex::Autolock l(mInputMutex);
     // If in middle of capture, can't clear out queue
     if (mState == LOCKED) return OK;

     return clearZslQueueLocked();
 }

 status_t ZslProcessor3::clearZslQueueLocked() {
     if (mZslStream != 0) {
         return mZslStream->clearInputRingBuffer();
     }
     return OK;
 }

 void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const {
     Mutex::Autolock l(mInputMutex);
     if (!mLatestCapturedRequest.isEmpty()) {
         String8 result("    Latest ZSL capture request:\n");
         write(fd, result.string(), result.size());
         mLatestCapturedRequest.dump(fd, 2, 6);
     } else {
         String8 result("    Latest ZSL capture request: none yet\n");
         write(fd, result.string(), result.size());
     }
     dumpZslQueue(fd);
 }

 bool ZslProcessor3::threadLoop() {
     // TODO: remove dependency on thread
     return true;
 }

 void ZslProcessor3::dumpZslQueue(int fd) const {
     String8 header("ZSL queue contents:");
     String8 indent("    ");
     ALOGV("%s", header.string());
     if (fd != -1) {
         header = indent + header + "\n";
         write(fd, header.string(), header.size());
     }
     for (size_t i = 0; i < mZslQueue.size(); i++) {
         const ZslPair &queueEntry = mZslQueue[i];
         nsecs_t bufferTimestamp = queueEntry.buffer.mTimestamp;
         camera_metadata_ro_entry_t entry;
         nsecs_t frameTimestamp = 0;
         int frameAeState = -1;
         if (!queueEntry.frame.isEmpty()) {
             entry = queueEntry.frame.find(ANDROID_SENSOR_TIMESTAMP);
             if (entry.count > 0) frameTimestamp = entry.data.i64[0];
             entry = queueEntry.frame.find(ANDROID_CONTROL_AE_STATE);
             if (entry.count > 0) frameAeState = entry.data.u8[0];
         }
         String8 result =
                 String8::format("   %d: b: %lld\tf: %lld, AE state: %d", i,
                         bufferTimestamp, frameTimestamp, frameAeState);
         ALOGV("%s", result.string());
         if (fd != -1) {
             result = indent + result + "\n";
             write(fd, result.string(), result.size());
         }

     }
 }

 nsecs_t ZslProcessor3::getCandidateTimestampLocked(size_t* metadataIdx) const {
     /**
      * Find the smallest timestamp we know about so far
      * - ensure that aeState is either converged or locked
      */

     size_t idx = 0;
     nsecs_t minTimestamp = -1;
     for (size_t j = 0; j < mFrameList.size(); j++) {
         const CameraMetadata &frame = mFrameList[j];
         if (!frame.isEmpty()) {
             camera_metadata_ro_entry_t entry;
             entry = frame.find(ANDROID_SENSOR_TIMESTAMP);
             if (entry.count == 0) {
                 ALOGE("%s: Can't find timestamp in frame!",
                         __FUNCTION__);
                 continue;
             }
             nsecs_t frameTimestamp = entry.data.i64[0];
             if (minTimestamp > frameTimestamp) {

                 entry = frame.find(ANDROID_CONTROL_AE_STATE);
                 if (entry.count == 0) {
                     ALOGW("%s: ZSL queue frame has no AE state field!",
                             __FUNCTION__);
                     continue;
                 }
                 if (entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_CONVERGED &&
                         entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_LOCKED) {
                     ALOGVV("%s: ZSL queue frame AE state is %d, need "
                            "full capture",  __FUNCTION__, entry.data.u8[0]);
                     continue;
                 }

                 minTimestamp = frameTimestamp;
                 idx = j;
             }
         }
     }

     if (metadataIdx) {
         *metadataIdx = idx;
     }

     return minTimestamp;
 }

 void ZslProcessor3::onBufferAcquired(const BufferInfo& /*bufferInfo*/) {
     // Intentionally left empty
     // Although theoretically we could use this to get better dump info
 }

 void ZslProcessor3::onBufferReleased(const BufferInfo& bufferInfo) {
     Mutex::Autolock l(mInputMutex);

     // ignore output buffers
     if (bufferInfo.mOutput) {
         return;
     }

     // TODO: Verify that the buffer is in our queue by looking at timestamp
     // theoretically unnecessary unless we change the following assumptions:
     // -- only 1 buffer reprocessed at a time (which is the case now)

     // Erase entire ZSL queue since we've now completed the capture and preview
     // is stopped.
     //
     // We need to guarantee that if we do two back-to-back captures,
     // the second won't use a buffer that's older/the same as the first, which
     // is theoretically possible if we don't clear out the queue and the
     // selection criteria is something like 'newest'. Clearing out the queue
     // on a completed capture ensures we'll only use new data.
     ALOGV("%s: Memory optimization, clearing ZSL queue",
           __FUNCTION__);
     clearZslQueueLocked();

     // Required so we accept more ZSL requests
     mState = RUNNING;
 }

 }; // namespace camera2
 }; // namespace android
	/*
	* Copyright (C) 2013 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	#define LOG_TAG "Camera2-ZslProcessor3"
	#define ATRACE_TAG ATRACE_TAG_CAMERA
	//#define LOG_NDEBUG 0
	//#define LOG_NNDEBUG 0

	#ifdef LOG_NNDEBUG
	#define ALOGVV(...) ALOGV(__VA_ARGS__)
	#else
	#define ALOGVV(...) ((void)0)
	#endif

	#include <utils/Log.h>
	#include <utils/Trace.h>

	#include "ZslProcessor3.h"
	#include <gui/Surface.h>
	#include "../CameraDeviceBase.h"
	#include "../Camera3Device.h"
	#include "../Camera2Client.h"


	namespace android {
	namespace camera2 {

	ZslProcessor3::ZslProcessor3(
	sp<Camera2Client> client,
	wp<CaptureSequencer> sequencer):
	Thread(false),
	mState(RUNNING),
	mClient(client),
	mSequencer(sequencer),
	mId(client->getCameraId()),
	mZslStreamId(NO_STREAM),
	mFrameListHead(0),
	mZslQueueHead(0),
	mZslQueueTail(0) {
	mZslQueue.insertAt(0, kZslBufferDepth);
	mFrameList.insertAt(0, kFrameListDepth);
	sp<CaptureSequencer> captureSequencer = mSequencer.promote();
	if (captureSequencer != 0) captureSequencer->setZslProcessor(this);
	}

	ZslProcessor3::~ZslProcessor3() {
	ALOGV("%s: Exit", __FUNCTION__);
	deleteStream();
	}

	void ZslProcessor3::onFrameAvailable(int32_t /frameId/,
	const CameraMetadata &frame) {
	Mutex::Autolock l(mInputMutex);
	camera_metadata_ro_entry_t entry;
	entry = frame.find(ANDROID_SENSOR_TIMESTAMP);
	nsecs_t timestamp = entry.data.i64[0];
	(void)timestamp;
	ALOGVV("Got preview metadata for timestamp %lld", timestamp);

	if (mState != RUNNING) return;

	mFrameList.editItemAt(mFrameListHead) = frame;
	mFrameListHead = (mFrameListHead + 1) % kFrameListDepth;
	}

	status_t ZslProcessor3::updateStream(const Parameters &params) {
	ATRACE_CALL();
	ALOGV("%s: Configuring ZSL streams", __FUNCTION__);
	status_t res;

	Mutex::Autolock l(mInputMutex);

	sp<Camera2Client> client = mClient.promote();
	if (client == 0) {
	ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
	return INVALID_OPERATION;
	}
	sp<Camera3Device> device =
	static_cast<Camera3Device*>(client->getCameraDevice().get());
	if (device == 0) {
	ALOGE("%s: Camera %d: Device does not exist", __FUNCTION__, mId);
	return INVALID_OPERATION;
	}

	if (mZslStreamId != NO_STREAM) {
	// Check if stream parameters have to change
	uint32_t currentWidth, currentHeight;
	res = device->getStreamInfo(mZslStreamId,
	&currentWidth, &currentHeight, 0);
	if (res != OK) {
	ALOGE("%s: Camera %d: Error querying capture output stream info: "
	"%s (%d)", __FUNCTION__,
	client->getCameraId(), strerror(-res), res);
	return res;
	}
	if (currentWidth != (uint32_t)params.fastInfo.arrayWidth \|\|
	currentHeight != (uint32_t)params.fastInfo.arrayHeight) {
	ALOGV("%s: Camera %d: Deleting stream %d since the buffer "
	"dimensions changed",
	__FUNCTION__, client->getCameraId(), mZslStreamId);
	res = device->deleteStream(mZslStreamId);
	if (res == -EBUSY) {
	ALOGV("%s: Camera %d: Device is busy, call updateStream again "
	" after it becomes idle", __FUNCTION__, mId);
	return res;
	} else if(res != OK) {
	ALOGE("%s: Camera %d: Unable to delete old output stream "
	"for ZSL: %s (%d)", __FUNCTION__,
	client->getCameraId(), strerror(-res), res);
	return res;
	}
	mZslStreamId = NO_STREAM;
	}
	}

	if (mZslStreamId == NO_STREAM) {
	// Create stream for HAL production
	// TODO: Sort out better way to select resolution for ZSL

	// Note that format specified internally in Camera3ZslStream
	res = device->createZslStream(
	params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
	kZslBufferDepth,
	&mZslStreamId,
	&mZslStream);
	if (res != OK) {
	ALOGE("%s: Camera %d: Can't create ZSL stream: "
	"%s (%d)", __FUNCTION__, client->getCameraId(),
	strerror(-res), res);
	return res;
	}
	}
	client->registerFrameListener(Camera2Client::kPreviewRequestIdStart,
	Camera2Client::kPreviewRequestIdEnd,
	this);

	return OK;
	}

	status_t ZslProcessor3::deleteStream() {
	ATRACE_CALL();
	status_t res;

	Mutex::Autolock l(mInputMutex);

	if (mZslStreamId != NO_STREAM) {
	sp<Camera2Client> client = mClient.promote();
	if (client == 0) {
	ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
	return INVALID_OPERATION;
	}

	sp<Camera3Device> device =
	reinterpret_cast<Camera3Device*>(client->getCameraDevice().get());
	if (device == 0) {
	ALOGE("%s: Camera %d: Device does not exist", __FUNCTION__, mId);
	return INVALID_OPERATION;
	}

	res = device->deleteStream(mZslStreamId);
	if (res != OK) {
	ALOGE("%s: Camera %d: Cannot delete ZSL output stream %d: "
	"%s (%d)", __FUNCTION__, client->getCameraId(),
	mZslStreamId, strerror(-res), res);
	return res;
	}

	mZslStreamId = NO_STREAM;
	}
	return OK;
	}

	int ZslProcessor3::getStreamId() const {
	Mutex::Autolock l(mInputMutex);
	return mZslStreamId;
	}

	status_t ZslProcessor3::pushToReprocess(int32_t requestId) {
	ALOGV("%s: Send in reprocess request with id %d",
	__FUNCTION__, requestId);
	Mutex::Autolock l(mInputMutex);
	status_t res;
	sp<Camera2Client> client = mClient.promote();

	if (client == 0) {
	ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);
	return INVALID_OPERATION;
	}

	IF_ALOGV() {
	dumpZslQueue(-1);
	}

	size_t metadataIdx;
	nsecs_t candidateTimestamp = getCandidateTimestampLocked(&metadataIdx);

	if (candidateTimestamp == -1) {
	ALOGE("%s: Could not find good candidate for ZSL reprocessing",
	__FUNCTION__);
	return NOT_ENOUGH_DATA;
	}

	res = mZslStream->enqueueInputBufferByTimestamp(candidateTimestamp,
	/actualTimestamp/NULL);

	if (res == mZslStream->NO_BUFFER_AVAILABLE) {
	ALOGV("%s: No ZSL buffers yet", __FUNCTION__);
	return NOT_ENOUGH_DATA;
	} else if (res != OK) {
	ALOGE("%s: Unable to push buffer for reprocessing: %s (%d)",
	__FUNCTION__, strerror(-res), res);
	return res;
	}

	{
	CameraMetadata request = mFrameList[metadataIdx];

	// Verify that the frame is reasonable for reprocessing

	camera_metadata_entry_t entry;
	entry = request.find(ANDROID_CONTROL_AE_STATE);
	if (entry.count == 0) {
	ALOGE("%s: ZSL queue frame has no AE state field!",
	__FUNCTION__);
	return BAD_VALUE;
	}
	if (entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_CONVERGED &&
	entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_LOCKED) {
	ALOGV("%s: ZSL queue frame AE state is %d, need full capture",
	__FUNCTION__, entry.data.u8[0]);
	return NOT_ENOUGH_DATA;
	}

	uint8_t requestType = ANDROID_REQUEST_TYPE_REPROCESS;
	res = request.update(ANDROID_REQUEST_TYPE,
	&requestType, 1);
	uint8_t inputStreams[1] =
	{ static_cast<uint8_t>(mZslStreamId) };
	if (res == OK) request.update(ANDROID_REQUEST_INPUT_STREAMS,
	inputStreams, 1);
	// TODO: Shouldn't we also update the latest preview frame?
	uint8_t outputStreams[1] =
	{ static_cast<uint8_t>(client->getCaptureStreamId()) };
	if (res == OK) request.update(ANDROID_REQUEST_OUTPUT_STREAMS,
	outputStreams, 1);
	res = request.update(ANDROID_REQUEST_ID,
	&requestId, 1);

	if (res != OK ) {
	ALOGE("%s: Unable to update frame to a reprocess request",
	__FUNCTION__);
	return INVALID_OPERATION;
	}

	res = client->stopStream();
	if (res != OK) {
	ALOGE("%s: Camera %d: Unable to stop preview for ZSL capture: "
	"%s (%d)",
	__FUNCTION__, client->getCameraId(), strerror(-res), res);
	return INVALID_OPERATION;
	}

	// Update JPEG settings
	{
	SharedParameters::Lock l(client->getParameters());
	res = l.mParameters.updateRequestJpeg(&request);
	if (res != OK) {
	ALOGE("%s: Camera %d: Unable to update JPEG entries of ZSL "
	"capture request: %s (%d)", __FUNCTION__,
	client->getCameraId(),
	strerror(-res), res);
	return res;
	}
	}

	mLatestCapturedRequest = request;
	res = client->getCameraDevice()->capture(request);
	if (res != OK ) {
	ALOGE("%s: Unable to send ZSL reprocess request to capture: %s"
	" (%d)", __FUNCTION__, strerror(-res), res);
	return res;
	}

	mState = LOCKED;
	}

	return OK;
	}

	status_t ZslProcessor3::clearZslQueue() {
	Mutex::Autolock l(mInputMutex);
	// If in middle of capture, can't clear out queue
	if (mState == LOCKED) return OK;

	return clearZslQueueLocked();
	}

	status_t ZslProcessor3::clearZslQueueLocked() {
	if (mZslStream != 0) {
	return mZslStream->clearInputRingBuffer();
	}
	return OK;
	}

	void ZslProcessor3::dump(int fd, const Vector<String16>& /args/) const {
	Mutex::Autolock l(mInputMutex);
	if (!mLatestCapturedRequest.isEmpty()) {
	String8 result(" Latest ZSL capture request:\n");
	write(fd, result.string(), result.size());
	mLatestCapturedRequest.dump(fd, 2, 6);
	} else {
	String8 result(" Latest ZSL capture request: none yet\n");
	write(fd, result.string(), result.size());
	}
	dumpZslQueue(fd);
	}

	bool ZslProcessor3::threadLoop() {
	// TODO: remove dependency on thread
	return true;
	}

	void ZslProcessor3::dumpZslQueue(int fd) const {
	String8 header("ZSL queue contents:");
	String8 indent(" ");
	ALOGV("%s", header.string());
	if (fd != -1) {
	header = indent + header + "\n";
	write(fd, header.string(), header.size());
	}
	for (size_t i = 0; i < mZslQueue.size(); i++) {
	const ZslPair &queueEntry = mZslQueue[i];
	nsecs_t bufferTimestamp = queueEntry.buffer.mTimestamp;
	camera_metadata_ro_entry_t entry;
	nsecs_t frameTimestamp = 0;
	int frameAeState = -1;
	if (!queueEntry.frame.isEmpty()) {
	entry = queueEntry.frame.find(ANDROID_SENSOR_TIMESTAMP);
	if (entry.count > 0) frameTimestamp = entry.data.i64[0];
	entry = queueEntry.frame.find(ANDROID_CONTROL_AE_STATE);
	if (entry.count > 0) frameAeState = entry.data.u8[0];
	}
	String8 result =
	String8::format(" %d: b: %lld\tf: %lld, AE state: %d", i,
	bufferTimestamp, frameTimestamp, frameAeState);
	ALOGV("%s", result.string());
	if (fd != -1) {
	result = indent + result + "\n";
	write(fd, result.string(), result.size());
	}

	}
	}

	nsecs_t ZslProcessor3::getCandidateTimestampLocked(size_t* metadataIdx) const {
	/**
	* Find the smallest timestamp we know about so far
	* - ensure that aeState is either converged or locked
	*/

	size_t idx = 0;
	nsecs_t minTimestamp = -1;
	for (size_t j = 0; j < mFrameList.size(); j++) {
	const CameraMetadata &frame = mFrameList[j];
	if (!frame.isEmpty()) {
	camera_metadata_ro_entry_t entry;
	entry = frame.find(ANDROID_SENSOR_TIMESTAMP);
	if (entry.count == 0) {
	ALOGE("%s: Can't find timestamp in frame!",
	__FUNCTION__);
	continue;
	}
	nsecs_t frameTimestamp = entry.data.i64[0];
	if (minTimestamp > frameTimestamp) {

	entry = frame.find(ANDROID_CONTROL_AE_STATE);
	if (entry.count == 0) {
	ALOGW("%s: ZSL queue frame has no AE state field!",
	__FUNCTION__);
	continue;
	}
	if (entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_CONVERGED &&
	entry.data.u8[0] != ANDROID_CONTROL_AE_STATE_LOCKED) {
	ALOGVV("%s: ZSL queue frame AE state is %d, need "
	"full capture", __FUNCTION__, entry.data.u8[0]);
	continue;
	}

	minTimestamp = frameTimestamp;
	idx = j;
	}
	}
	}

	if (metadataIdx) {
	*metadataIdx = idx;
	}

	return minTimestamp;
	}

	void ZslProcessor3::onBufferAcquired(const BufferInfo& /bufferInfo/) {
	// Intentionally left empty
	// Although theoretically we could use this to get better dump info
	}

	void ZslProcessor3::onBufferReleased(const BufferInfo& bufferInfo) {
	Mutex::Autolock l(mInputMutex);

	// ignore output buffers
	if (bufferInfo.mOutput) {
	return;
	}

	// TODO: Verify that the buffer is in our queue by looking at timestamp
	// theoretically unnecessary unless we change the following assumptions:
	// -- only 1 buffer reprocessed at a time (which is the case now)

	// Erase entire ZSL queue since we've now completed the capture and preview
	// is stopped.
	//
	// We need to guarantee that if we do two back-to-back captures,
	// the second won't use a buffer that's older/the same as the first, which
	// is theoretically possible if we don't clear out the queue and the
	// selection criteria is something like 'newest'. Clearing out the queue
	// on a completed capture ensures we'll only use new data.
	ALOGV("%s: Memory optimization, clearing ZSL queue",
	__FUNCTION__);
	clearZslQueueLocked();

	// Required so we accept more ZSL requests
	mState = RUNNING;
	}

	}; // namespace camera2
	}; // namespace android