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

 /*
  * Copyright (C) 2012 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-ZslProcessor"
 #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 "ZslProcessor.h"
 #include <gui/Surface.h>
 #include "../CameraDeviceBase.h"
 #include "../Camera2Client.h"


 namespace android {
 namespace camera2 {

 ZslProcessor::ZslProcessor(
     wp<Camera2Client> client,
     wp<CaptureSequencer> sequencer):
         Thread(false),
         mState(RUNNING),
         mClient(client),
         mSequencer(sequencer),
         mZslBufferAvailable(false),
         mZslStreamId(NO_STREAM),
         mZslReprocessStreamId(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);
 }

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

 void ZslProcessor::onFrameAvailable() {
     Mutex::Autolock l(mInputMutex);
     if (!mZslBufferAvailable) {
         mZslBufferAvailable = true;
         mZslBufferAvailableSignal.signal();
     }
 }

 void ZslProcessor::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 frame for timestamp %lld", timestamp);

     if (mState != RUNNING) return;

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

     findMatchesLocked();
 }

 void ZslProcessor::onBufferReleased(buffer_handle_t *handle) {
     Mutex::Autolock l(mInputMutex);

     // Verify that the buffer is in our queue
     size_t i = 0;
     for (; i < mZslQueue.size(); i++) {
         if (&(mZslQueue[i].buffer.mGraphicBuffer->handle) == handle) break;
     }
     if (i == mZslQueue.size()) {
         ALOGW("%s: Released buffer %p not found in queue",
                 __FUNCTION__, handle);
     }

     // Erase entire ZSL queue since we've now completed the capture and preview
     // is stopped.
     clearZslQueueLocked();

     mState = RUNNING;
 }

 status_t ZslProcessor::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) return OK;
     sp<CameraDeviceBase> device = client->getCameraDevice();

     if (mZslConsumer == 0) {
         // Create CPU buffer queue endpoint
         mZslConsumer = new BufferItemConsumer(
             GRALLOC_USAGE_HW_CAMERA_ZSL,
             kZslBufferDepth,
             true);
         mZslConsumer->setFrameAvailableListener(this);
         mZslConsumer->setName(String8("Camera2Client::ZslConsumer"));
         mZslWindow = new Surface(
             mZslConsumer->getProducerInterface());
     }

     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) {
             res = device->deleteReprocessStream(mZslReprocessStreamId);
             if (res != OK) {
                 ALOGE("%s: Camera %d: Unable to delete old reprocess stream "
                         "for ZSL: %s (%d)", __FUNCTION__,
                         client->getCameraId(), strerror(-res), res);
                 return res;
             }
             ALOGV("%s: Camera %d: Deleting stream %d since the buffer dimensions changed",
                 __FUNCTION__, client->getCameraId(), mZslStreamId);
             res = device->deleteStream(mZslStreamId);
             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
         int streamType = params.quirks.useZslFormat ?
                 (int)CAMERA2_HAL_PIXEL_FORMAT_ZSL :
                 (int)HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;
         res = device->createStream(mZslWindow,
                 params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
                 streamType, 0,
                 &mZslStreamId);
         if (res != OK) {
             ALOGE("%s: Camera %d: Can't create output stream for ZSL: "
                     "%s (%d)", __FUNCTION__, client->getCameraId(),
                     strerror(-res), res);
             return res;
         }
         res = device->createReprocessStreamFromStream(mZslStreamId,
                 &mZslReprocessStreamId);
         if (res != OK) {
             ALOGE("%s: Camera %d: Can't create reprocess stream for ZSL: "
                     "%s (%d)", __FUNCTION__, client->getCameraId(),
                     strerror(-res), res);
             return res;
         }
     }
     client->registerFrameListener(Camera2Client::kPreviewRequestIdStart,
             Camera2Client::kPreviewRequestIdEnd,
             this);

     return OK;
 }

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

     Mutex::Autolock l(mInputMutex);

     if (mZslStreamId != NO_STREAM) {
         sp<Camera2Client> client = mClient.promote();
         if (client == 0) return OK;
         sp<CameraDeviceBase> device = client->getCameraDevice();

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

         mZslReprocessStreamId = NO_STREAM;
         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;
         }

         mZslWindow.clear();
         mZslConsumer.clear();

         mZslStreamId = NO_STREAM;
     }
     return OK;
 }

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

 int ZslProcessor::getReprocessStreamId() const {
     Mutex::Autolock l(mInputMutex);
     return mZslReprocessStreamId;
 }

 status_t ZslProcessor::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) return INVALID_OPERATION;

     IF_ALOGV() {
         dumpZslQueue(-1);
     }

     if (mZslQueueTail != mZslQueueHead) {
         CameraMetadata request;
         size_t index = mZslQueueTail;
         while (index != mZslQueueHead) {
             if (!mZslQueue[index].frame.isEmpty()) {
                 request = mZslQueue[index].frame;
                 break;
             }
             index = (index + 1) % kZslBufferDepth;
         }
         if (index == mZslQueueHead) {
             ALOGV("%s: ZSL queue has no valid frames to send yet.",
                   __FUNCTION__);
             return NOT_ENOUGH_DATA;
         }
         // 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;
         }

         buffer_handle_t *handle =
             &(mZslQueue[index].buffer.mGraphicBuffer->handle);

         uint8_t requestType = ANDROID_REQUEST_TYPE_REPROCESS;
         res = request.update(ANDROID_REQUEST_TYPE,
                 &requestType, 1);
         uint8_t inputStreams[1] =
                 { static_cast<uint8_t>(mZslReprocessStreamId) };
         if (res == OK) request.update(ANDROID_REQUEST_INPUT_STREAMS,
                 inputStreams, 1);
         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;
         }
         // TODO: have push-and-clear be atomic
         res = client->getCameraDevice()->pushReprocessBuffer(mZslReprocessStreamId,
                 handle, this);
         if (res != OK) {
             ALOGE("%s: Unable to push buffer for reprocessing: %s (%d)",
                     __FUNCTION__, strerror(-res), res);
             return res;
         }

         // 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;
     } else {
         ALOGV("%s: No ZSL buffers yet", __FUNCTION__);
         return NOT_ENOUGH_DATA;
     }
     return OK;
 }

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

     return clearZslQueueLocked();
 }

 status_t ZslProcessor::clearZslQueueLocked() {
     for (size_t i = 0; i < mZslQueue.size(); i++) {
         if (mZslQueue[i].buffer.mTimestamp != 0) {
             mZslConsumer->releaseBuffer(mZslQueue[i].buffer);
         }
         mZslQueue.replaceAt(i);
     }
     mZslQueueHead = 0;
     mZslQueueTail = 0;
     return OK;
 }

 void ZslProcessor::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 ZslProcessor::threadLoop() {
     status_t res;

     {
         Mutex::Autolock l(mInputMutex);
         while (!mZslBufferAvailable) {
             res = mZslBufferAvailableSignal.waitRelative(mInputMutex,
                     kWaitDuration);
             if (res == TIMED_OUT) return true;
         }
         mZslBufferAvailable = false;
     }

     do {
         sp<Camera2Client> client = mClient.promote();
         if (client == 0) return false;
         res = processNewZslBuffer(client);
     } while (res == OK);

     return true;
 }

 status_t ZslProcessor::processNewZslBuffer(sp<Camera2Client> &client) {
     ATRACE_CALL();
     status_t res;

     ALOGVV("Trying to get next buffer");
     BufferItemConsumer::BufferItem item;
     res = mZslConsumer->acquireBuffer(&item);
     if (res != OK) {
         if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {
             ALOGE("%s: Camera %d: Error receiving ZSL image buffer: "
                     "%s (%d)", __FUNCTION__,
                     client->getCameraId(), strerror(-res), res);
         } else {
             ALOGVV("  No buffer");
         }
         return res;
     }

     Mutex::Autolock l(mInputMutex);

     if (mState == LOCKED) {
         ALOGVV("In capture, discarding new ZSL buffers");
         mZslConsumer->releaseBuffer(item);
         return OK;
     }

     ALOGVV("Got ZSL buffer: head: %d, tail: %d", mZslQueueHead, mZslQueueTail);

     if ( (mZslQueueHead + 1) % kZslBufferDepth == mZslQueueTail) {
         ALOGVV("Releasing oldest buffer");
         mZslConsumer->releaseBuffer(mZslQueue[mZslQueueTail].buffer);
         mZslQueue.replaceAt(mZslQueueTail);
         mZslQueueTail = (mZslQueueTail + 1) % kZslBufferDepth;
     }

     ZslPair &queueHead = mZslQueue.editItemAt(mZslQueueHead);

     queueHead.buffer = item;
     queueHead.frame.release();

     mZslQueueHead = (mZslQueueHead + 1) % kZslBufferDepth;

     ALOGVV("  Acquired buffer, timestamp %lld", queueHead.buffer.mTimestamp);

     findMatchesLocked();

     return OK;
 }

 void ZslProcessor::findMatchesLocked() {
     ALOGVV("Scanning");
     for (size_t i = 0; i < mZslQueue.size(); i++) {
         ZslPair &queueEntry = mZslQueue.editItemAt(i);
         nsecs_t bufferTimestamp = queueEntry.buffer.mTimestamp;
         IF_ALOGV() {
             camera_metadata_entry_t entry;
             nsecs_t frameTimestamp = 0;
             if (!queueEntry.frame.isEmpty()) {
                 entry = queueEntry.frame.find(ANDROID_SENSOR_TIMESTAMP);
                 frameTimestamp = entry.data.i64[0];
             }
             ALOGVV("   %d: b: %lld\tf: %lld", i,
                     bufferTimestamp, frameTimestamp );
         }
         if (queueEntry.frame.isEmpty() && bufferTimestamp != 0) {
             // Have buffer, no matching frame. Look for one
             for (size_t j = 0; j < mFrameList.size(); j++) {
                 bool match = false;
                 CameraMetadata &frame = mFrameList.editItemAt(j);
                 if (!frame.isEmpty()) {
                     camera_metadata_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 (bufferTimestamp == frameTimestamp) {
                         ALOGVV("%s: Found match %lld", __FUNCTION__,
                                 frameTimestamp);
                         match = true;
                     } else {
                         int64_t delta = abs(bufferTimestamp - frameTimestamp);
                         if ( delta < 1000000) {
                             ALOGVV("%s: Found close match %lld (delta %lld)",
                                     __FUNCTION__, bufferTimestamp, delta);
                             match = true;
                         }
                     }
                 }
                 if (match) {
                     queueEntry.frame.acquire(frame);
                     break;
                 }
             }
         }
     }
 }

 void ZslProcessor::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());
         }

     }
 }

 }; // namespace camera2
 }; // namespace android
	/*
	* Copyright (C) 2012 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-ZslProcessor"
	#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 "ZslProcessor.h"
	#include <gui/Surface.h>
	#include "../CameraDeviceBase.h"
	#include "../Camera2Client.h"


	namespace android {
	namespace camera2 {

	ZslProcessor::ZslProcessor(
	wp<Camera2Client> client,
	wp<CaptureSequencer> sequencer):
	Thread(false),
	mState(RUNNING),
	mClient(client),
	mSequencer(sequencer),
	mZslBufferAvailable(false),
	mZslStreamId(NO_STREAM),
	mZslReprocessStreamId(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);
	}

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

	void ZslProcessor::onFrameAvailable() {
	Mutex::Autolock l(mInputMutex);
	if (!mZslBufferAvailable) {
	mZslBufferAvailable = true;
	mZslBufferAvailableSignal.signal();
	}
	}

	void ZslProcessor::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 frame for timestamp %lld", timestamp);

	if (mState != RUNNING) return;

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

	findMatchesLocked();
	}

	void ZslProcessor::onBufferReleased(buffer_handle_t *handle) {
	Mutex::Autolock l(mInputMutex);

	// Verify that the buffer is in our queue
	size_t i = 0;
	for (; i < mZslQueue.size(); i++) {
	if (&(mZslQueue[i].buffer.mGraphicBuffer->handle) == handle) break;
	}
	if (i == mZslQueue.size()) {
	ALOGW("%s: Released buffer %p not found in queue",
	__FUNCTION__, handle);
	}

	// Erase entire ZSL queue since we've now completed the capture and preview
	// is stopped.
	clearZslQueueLocked();

	mState = RUNNING;
	}

	status_t ZslProcessor::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) return OK;
	sp<CameraDeviceBase> device = client->getCameraDevice();

	if (mZslConsumer == 0) {
	// Create CPU buffer queue endpoint
	mZslConsumer = new BufferItemConsumer(
	GRALLOC_USAGE_HW_CAMERA_ZSL,
	kZslBufferDepth,
	true);
	mZslConsumer->setFrameAvailableListener(this);
	mZslConsumer->setName(String8("Camera2Client::ZslConsumer"));
	mZslWindow = new Surface(
	mZslConsumer->getProducerInterface());
	}

	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) {
	res = device->deleteReprocessStream(mZslReprocessStreamId);
	if (res != OK) {
	ALOGE("%s: Camera %d: Unable to delete old reprocess stream "
	"for ZSL: %s (%d)", __FUNCTION__,
	client->getCameraId(), strerror(-res), res);
	return res;
	}
	ALOGV("%s: Camera %d: Deleting stream %d since the buffer dimensions changed",
	__FUNCTION__, client->getCameraId(), mZslStreamId);
	res = device->deleteStream(mZslStreamId);
	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
	int streamType = params.quirks.useZslFormat ?
	(int)CAMERA2_HAL_PIXEL_FORMAT_ZSL :
	(int)HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;
	res = device->createStream(mZslWindow,
	params.fastInfo.arrayWidth, params.fastInfo.arrayHeight,
	streamType, 0,
	&mZslStreamId);
	if (res != OK) {
	ALOGE("%s: Camera %d: Can't create output stream for ZSL: "
	"%s (%d)", __FUNCTION__, client->getCameraId(),
	strerror(-res), res);
	return res;
	}
	res = device->createReprocessStreamFromStream(mZslStreamId,
	&mZslReprocessStreamId);
	if (res != OK) {
	ALOGE("%s: Camera %d: Can't create reprocess stream for ZSL: "
	"%s (%d)", __FUNCTION__, client->getCameraId(),
	strerror(-res), res);
	return res;
	}
	}
	client->registerFrameListener(Camera2Client::kPreviewRequestIdStart,
	Camera2Client::kPreviewRequestIdEnd,
	this);

	return OK;
	}

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

	Mutex::Autolock l(mInputMutex);

	if (mZslStreamId != NO_STREAM) {
	sp<Camera2Client> client = mClient.promote();
	if (client == 0) return OK;
	sp<CameraDeviceBase> device = client->getCameraDevice();

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

	mZslReprocessStreamId = NO_STREAM;
	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;
	}

	mZslWindow.clear();
	mZslConsumer.clear();

	mZslStreamId = NO_STREAM;
	}
	return OK;
	}

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

	int ZslProcessor::getReprocessStreamId() const {
	Mutex::Autolock l(mInputMutex);
	return mZslReprocessStreamId;
	}

	status_t ZslProcessor::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) return INVALID_OPERATION;

	IF_ALOGV() {
	dumpZslQueue(-1);
	}

	if (mZslQueueTail != mZslQueueHead) {
	CameraMetadata request;
	size_t index = mZslQueueTail;
	while (index != mZslQueueHead) {
	if (!mZslQueue[index].frame.isEmpty()) {
	request = mZslQueue[index].frame;
	break;
	}
	index = (index + 1) % kZslBufferDepth;
	}
	if (index == mZslQueueHead) {
	ALOGV("%s: ZSL queue has no valid frames to send yet.",
	__FUNCTION__);
	return NOT_ENOUGH_DATA;
	}
	// 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;
	}

	buffer_handle_t *handle =
	&(mZslQueue[index].buffer.mGraphicBuffer->handle);

	uint8_t requestType = ANDROID_REQUEST_TYPE_REPROCESS;
	res = request.update(ANDROID_REQUEST_TYPE,
	&requestType, 1);
	uint8_t inputStreams[1] =
	{ static_cast<uint8_t>(mZslReprocessStreamId) };
	if (res == OK) request.update(ANDROID_REQUEST_INPUT_STREAMS,
	inputStreams, 1);
	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;
	}
	// TODO: have push-and-clear be atomic
	res = client->getCameraDevice()->pushReprocessBuffer(mZslReprocessStreamId,
	handle, this);
	if (res != OK) {
	ALOGE("%s: Unable to push buffer for reprocessing: %s (%d)",
	__FUNCTION__, strerror(-res), res);
	return res;
	}

	// 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;
	} else {
	ALOGV("%s: No ZSL buffers yet", __FUNCTION__);
	return NOT_ENOUGH_DATA;
	}
	return OK;
	}

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

	return clearZslQueueLocked();
	}

	status_t ZslProcessor::clearZslQueueLocked() {
	for (size_t i = 0; i < mZslQueue.size(); i++) {
	if (mZslQueue[i].buffer.mTimestamp != 0) {
	mZslConsumer->releaseBuffer(mZslQueue[i].buffer);
	}
	mZslQueue.replaceAt(i);
	}
	mZslQueueHead = 0;
	mZslQueueTail = 0;
	return OK;
	}

	void ZslProcessor::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 ZslProcessor::threadLoop() {
	status_t res;

	{
	Mutex::Autolock l(mInputMutex);
	while (!mZslBufferAvailable) {
	res = mZslBufferAvailableSignal.waitRelative(mInputMutex,
	kWaitDuration);
	if (res == TIMED_OUT) return true;
	}
	mZslBufferAvailable = false;
	}

	do {
	sp<Camera2Client> client = mClient.promote();
	if (client == 0) return false;
	res = processNewZslBuffer(client);
	} while (res == OK);

	return true;
	}

	status_t ZslProcessor::processNewZslBuffer(sp<Camera2Client> &client) {
	ATRACE_CALL();
	status_t res;

	ALOGVV("Trying to get next buffer");
	BufferItemConsumer::BufferItem item;
	res = mZslConsumer->acquireBuffer(&item);
	if (res != OK) {
	if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {
	ALOGE("%s: Camera %d: Error receiving ZSL image buffer: "
	"%s (%d)", __FUNCTION__,
	client->getCameraId(), strerror(-res), res);
	} else {
	ALOGVV(" No buffer");
	}
	return res;
	}

	Mutex::Autolock l(mInputMutex);

	if (mState == LOCKED) {
	ALOGVV("In capture, discarding new ZSL buffers");
	mZslConsumer->releaseBuffer(item);
	return OK;
	}

	ALOGVV("Got ZSL buffer: head: %d, tail: %d", mZslQueueHead, mZslQueueTail);

	if ( (mZslQueueHead + 1) % kZslBufferDepth == mZslQueueTail) {
	ALOGVV("Releasing oldest buffer");
	mZslConsumer->releaseBuffer(mZslQueue[mZslQueueTail].buffer);
	mZslQueue.replaceAt(mZslQueueTail);
	mZslQueueTail = (mZslQueueTail + 1) % kZslBufferDepth;
	}

	ZslPair &queueHead = mZslQueue.editItemAt(mZslQueueHead);

	queueHead.buffer = item;
	queueHead.frame.release();

	mZslQueueHead = (mZslQueueHead + 1) % kZslBufferDepth;

	ALOGVV(" Acquired buffer, timestamp %lld", queueHead.buffer.mTimestamp);

	findMatchesLocked();

	return OK;
	}

	void ZslProcessor::findMatchesLocked() {
	ALOGVV("Scanning");
	for (size_t i = 0; i < mZslQueue.size(); i++) {
	ZslPair &queueEntry = mZslQueue.editItemAt(i);
	nsecs_t bufferTimestamp = queueEntry.buffer.mTimestamp;
	IF_ALOGV() {
	camera_metadata_entry_t entry;
	nsecs_t frameTimestamp = 0;
	if (!queueEntry.frame.isEmpty()) {
	entry = queueEntry.frame.find(ANDROID_SENSOR_TIMESTAMP);
	frameTimestamp = entry.data.i64[0];
	}
	ALOGVV(" %d: b: %lld\tf: %lld", i,
	bufferTimestamp, frameTimestamp );
	}
	if (queueEntry.frame.isEmpty() && bufferTimestamp != 0) {
	// Have buffer, no matching frame. Look for one
	for (size_t j = 0; j < mFrameList.size(); j++) {
	bool match = false;
	CameraMetadata &frame = mFrameList.editItemAt(j);
	if (!frame.isEmpty()) {
	camera_metadata_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 (bufferTimestamp == frameTimestamp) {
	ALOGVV("%s: Found match %lld", __FUNCTION__,
	frameTimestamp);
	match = true;
	} else {
	int64_t delta = abs(bufferTimestamp - frameTimestamp);
	if ( delta < 1000000) {
	ALOGVV("%s: Found close match %lld (delta %lld)",
	__FUNCTION__, bufferTimestamp, delta);
	match = true;
	}
	}
	}
	if (match) {
	queueEntry.frame.acquire(frame);
	break;
	}
	}
	}
	}
	}

	void ZslProcessor::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());
	}

	}
	}

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