camera2 (v)ndk: Add APIs for pre-allocation of surface buffers.
Clients may need to pre-allocate stream buffers in order to reduce
affects of buffer-allocation time such as frame jank till steady state
capture is reached (eg: for a repeating request).
The SDK already has an api which does this :
CameraCaptureSession.prepare(Surface). We're exposing a similar API to
the ndk/ vndk here.
Bug: 259735869
Test: NdkCameraDeviceTest.java
Change-Id: Iee8559fcebd61a6886f23779a05351b52633f851
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
diff --git a/camera/ndk/impl/ACameraCaptureSession.cpp b/camera/ndk/impl/ACameraCaptureSession.cpp
index 110d47a..73439c7 100644
--- a/camera/ndk/impl/ACameraCaptureSession.cpp
+++ b/camera/ndk/impl/ACameraCaptureSession.cpp
@@ -146,6 +146,27 @@
return ret;
}
+camera_status_t ACameraCaptureSession::prepare(ACameraWindowType* window) {
+#ifdef __ANDROID_VNDK__
+ std::shared_ptr<acam::CameraDevice> dev = getDevicePtr();
+#else
+ sp<acam::CameraDevice> dev = getDeviceSp();
+#endif
+ if (dev == nullptr) {
+ ALOGE("Error: Device associated with session %p has been closed!", this);
+ return ACAMERA_ERROR_SESSION_CLOSED;
+ }
+
+ camera_status_t ret;
+ dev->lockDeviceForSessionOps();
+ {
+ Mutex::Autolock _l(mSessionLock);
+ ret = dev->prepareLocked(window);
+ }
+ dev->unlockDevice();
+ return ret;
+}
+
ACameraDevice*
ACameraCaptureSession::getDevice() {
Mutex::Autolock _l(mSessionLock);
diff --git a/camera/ndk/impl/ACameraCaptureSession.h b/camera/ndk/impl/ACameraCaptureSession.h
index cd65e8c..145473b 100644
--- a/camera/ndk/impl/ACameraCaptureSession.h
+++ b/camera/ndk/impl/ACameraCaptureSession.h
@@ -130,6 +130,12 @@
camera_status_t updateOutputConfiguration(ACaptureSessionOutput *output);
+ void setWindowPreparedCallback(ACameraCaptureSession_prepareCallbacks *cb) {
+ Mutex::Autolock _l(mSessionLock);
+ mPreparedCb = *cb;
+ }
+ camera_status_t prepare(ACameraWindowType *window);
+
ACameraDevice* getDevice();
private:
@@ -156,6 +162,7 @@
bool mIsClosed = false;
bool mClosedByApp = false;
+ ACameraCaptureSession_prepareCallbacks mPreparedCb;
Mutex mSessionLock;
};
diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 536055b..b90f276 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -342,6 +342,58 @@
return ACAMERA_OK;
}
+camera_status_t CameraDevice::prepareLocked(ACameraWindowType *window) {
+ camera_status_t ret = checkCameraClosedOrErrorLocked();
+ if (ret != ACAMERA_OK) {
+ return ret;
+ }
+
+ if (window == nullptr) {
+ return ACAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ int32_t streamId = -1;
+ for (auto& kvPair : mConfiguredOutputs) {
+ if (window == kvPair.second.first) {
+ streamId = kvPair.first;
+ break;
+ }
+ }
+ if (streamId < 0) {
+ ALOGE("Error: Invalid output configuration");
+ return ACAMERA_ERROR_INVALID_PARAMETER;
+ }
+ auto remoteRet = mRemote->prepare(streamId);
+ if (!remoteRet.isOk()) {
+ // TODO:(b/259735869) Do this check for all other binder calls in the
+ // ndk as well.
+ if (remoteRet.exceptionCode() != EX_SERVICE_SPECIFIC) {
+ ALOGE("Camera device %s failed to prepare output window %p: %s", getId(), window,
+ remoteRet.toString8().string());
+ return ACAMERA_ERROR_UNKNOWN;
+
+ }
+ switch (remoteRet.serviceSpecificErrorCode()) {
+ case hardware::ICameraService::ERROR_INVALID_OPERATION:
+ ALOGE("Camera device %s invalid operation: %s", getId(),
+ remoteRet.toString8().string());
+ return ACAMERA_ERROR_INVALID_OPERATION;
+ break;
+ case hardware::ICameraService::ERROR_ILLEGAL_ARGUMENT:
+ ALOGE("Camera device %s invalid input argument: %s", getId(),
+ remoteRet.toString8().string());
+ return ACAMERA_ERROR_INVALID_PARAMETER;
+ break;
+ default:
+ ALOGE("Camera device %s failed to prepare output window %p: %s", getId(), window,
+ remoteRet.toString8().string());
+ return ACAMERA_ERROR_UNKNOWN;
+ }
+ }
+
+ return ACAMERA_OK;
+}
+
camera_status_t
CameraDevice::allocateCaptureRequest(
const ACaptureRequest* request, /*out*/sp<CaptureRequest>& outReq) {
@@ -919,6 +971,7 @@
case kWhatCaptureSeqEnd:
case kWhatCaptureSeqAbort:
case kWhatCaptureBufferLost:
+ case kWhatPreparedCb:
ALOGV("%s: Received msg %d", __FUNCTION__, msg->what());
break;
case kWhatCleanUpSessions:
@@ -992,6 +1045,7 @@
case kWhatCaptureSeqEnd:
case kWhatCaptureSeqAbort:
case kWhatCaptureBufferLost:
+ case kWhatPreparedCb:
{
sp<RefBase> obj;
found = msg->findObject(kSessionSpKey, &obj);
@@ -1034,6 +1088,26 @@
(*onState)(context, session.get());
break;
}
+ case kWhatPreparedCb:
+ {
+ ACameraCaptureSession_prepareCallback onWindowPrepared;
+ found = msg->findPointer(kCallbackFpKey, (void**) &onWindowPrepared);
+ if (!found) {
+ ALOGE("%s: Cannot find state callback!", __FUNCTION__);
+ return;
+ }
+ if (onWindowPrepared == nullptr) {
+ return;
+ }
+ ACameraWindowType* anw;
+ found = msg->findPointer(kAnwKey, (void**) &anw);
+ if (!found) {
+ ALOGE("%s: Cannot find ANativeWindow: %d!", __FUNCTION__, __LINE__);
+ return;
+ }
+ (*onWindowPrepared)(context, anw, session.get());
+ break;
+ }
case kWhatCaptureStart:
{
ACameraCaptureSession_captureCallback_start onStart;
@@ -1729,8 +1803,36 @@
}
binder::Status
-CameraDevice::ServiceCallback::onPrepared(int) {
- // Prepare not yet implemented in NDK
+CameraDevice::ServiceCallback::onPrepared(int streamId) {
+ ALOGV("%s: callback for stream id %d", __FUNCTION__, streamId);
+ binder::Status ret = binder::Status::ok();
+ sp<CameraDevice> dev = mDevice.promote();
+ if (dev == nullptr) {
+ return ret; // device has been closed
+ }
+ Mutex::Autolock _l(dev->mDeviceLock);
+ if (dev->isClosed() || dev->mRemote == nullptr) {
+ return ret;
+ }
+ auto it = dev->mConfiguredOutputs.find(streamId);
+ if (it == dev->mConfiguredOutputs.end()) {
+ ALOGE("%s: stream id %d does not exist", __FUNCTION__ , streamId);
+ return ret;
+ }
+ sp<ACameraCaptureSession> session = dev->mCurrentSession.promote();
+ if (session == nullptr) {
+ ALOGE("%s: Session is dead already", __FUNCTION__ );
+ return ret;
+ }
+ // We've found the window corresponding to the surface id.
+ ACameraWindowType *window = it->second.first;
+ sp<AMessage> msg = new AMessage(kWhatPreparedCb, dev->mHandler);
+ msg->setPointer(kContextKey, session->mPreparedCb.context);
+ msg->setPointer(kAnwKey, window);
+ msg->setObject(kSessionSpKey, session);
+ msg->setPointer(kCallbackFpKey, (void *)session->mPreparedCb.onWindowPrepared);
+ dev->postSessionMsgAndCleanup(msg);
+
return binder::Status::ok();
}
diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index 17988fe..382d6ce 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/camera/ndk/impl/ACameraDevice.h
@@ -151,6 +151,8 @@
camera_status_t updateOutputConfigurationLocked(ACaptureSessionOutput *output);
+ camera_status_t prepareLocked(ACameraWindowType *window);
+
camera_status_t allocateCaptureRequest(
const ACaptureRequest* request, sp<CaptureRequest>& outReq);
@@ -222,7 +224,8 @@
kWhatLogicalCaptureFail, // onLogicalCameraCaptureFailed
kWhatCaptureSeqEnd, // onCaptureSequenceCompleted
kWhatCaptureSeqAbort, // onCaptureSequenceAborted
- kWhatCaptureBufferLost,// onCaptureBufferLost
+ kWhatCaptureBufferLost, // onCaptureBufferLost
+ kWhatPreparedCb, // onWindowPrepared
// Internal cleanup
kWhatCleanUpSessions // Cleanup cached sp<ACameraCaptureSession>
};