The support inclues: - Physical camera specific stream support, - Physical camera result metadata, and Test: Newly added NDK CTS test pass Test: Newly added VNDK test pass Bug: 120566141 Bug: 115532726 Change-Id: I939b81522ca6c518c0e54ded5d3615f9973a6a65gugelfrei
Shuzhen Wang
6 years ago
parent
3c3c97ae53
commit
0ff9ae3ecb
@ -0,0 +1,68 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.
|
||||
*/
|
||||
|
||||
#include "ACameraCaptureSession.h"
|
||||
|
||||
#ifdef __ANDROID_VNDK__
|
||||
#include "ndk_vendor/impl/ACameraDeviceVendor.inc"
|
||||
#else
|
||||
#include "ACameraDevice.inc"
|
||||
#endif
|
||||
|
||||
using namespace android;
|
||||
|
||||
template <class T>
|
||||
camera_status_t
|
||||
ACameraCaptureSession::setRepeatingRequest(
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
sp<acam::CameraDevice> dev = getDeviceSp();
|
||||
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->setRepeatingRequestsLocked(
|
||||
this, cbs, numRequests, requests, captureSequenceId);
|
||||
}
|
||||
dev->unlockDevice();
|
||||
return ret;
|
||||
}
|
||||
|
||||
template <class T>
|
||||
camera_status_t ACameraCaptureSession::capture(
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
sp<acam::CameraDevice> dev = getDeviceSp();
|
||||
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->captureLocked(this, cbs, numRequests, requests, captureSequenceId);
|
||||
}
|
||||
dev->unlockDevice();
|
||||
return ret;
|
||||
}
|
||||
@ -0,0 +1,130 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
#include <inttypes.h>
|
||||
#include "ACameraDevice.h"
|
||||
#include "ACameraMetadata.h"
|
||||
#include "ACaptureRequest.h"
|
||||
#include "ACameraCaptureSession.h"
|
||||
|
||||
namespace android {
|
||||
namespace acam {
|
||||
|
||||
template<class T>
|
||||
camera_status_t
|
||||
CameraDevice::captureLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
return submitRequestsLocked(
|
||||
session, cbs, numRequests, requests, captureSequenceId, /*isRepeating*/false);
|
||||
}
|
||||
|
||||
template<class T>
|
||||
camera_status_t
|
||||
CameraDevice::setRepeatingRequestsLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
return submitRequestsLocked(
|
||||
session, cbs, numRequests, requests, captureSequenceId, /*isRepeating*/true);
|
||||
}
|
||||
|
||||
template<class T>
|
||||
camera_status_t CameraDevice::submitRequestsLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId,
|
||||
bool isRepeating) {
|
||||
camera_status_t ret = checkCameraClosedOrErrorLocked();
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Camera %s submit capture request failed! ret %d", getId(), ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Form two vectors of capture request, one for internal tracking
|
||||
std::vector<hardware::camera2::CaptureRequest> requestList;
|
||||
Vector<sp<CaptureRequest> > requestsV;
|
||||
requestsV.setCapacity(numRequests);
|
||||
for (int i = 0; i < numRequests; i++) {
|
||||
sp<CaptureRequest> req;
|
||||
ret = allocateCaptureRequest(requests[i], req);
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Convert capture request to internal format failure! ret %d", ret);
|
||||
return ret;
|
||||
}
|
||||
if (req->mSurfaceList.empty()) {
|
||||
ALOGE("Capture request without output target cannot be submitted!");
|
||||
return ACAMERA_ERROR_INVALID_PARAMETER;
|
||||
}
|
||||
requestList.push_back(*(req.get()));
|
||||
requestsV.push_back(req);
|
||||
}
|
||||
|
||||
if (isRepeating) {
|
||||
ret = stopRepeatingLocked();
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Camera %s stop repeating failed! ret %d", getId(), ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
binder::Status remoteRet;
|
||||
hardware::camera2::utils::SubmitInfo info;
|
||||
remoteRet = mRemote->submitRequestList(requestList, isRepeating, &info);
|
||||
int sequenceId = info.mRequestId;
|
||||
int64_t lastFrameNumber = info.mLastFrameNumber;
|
||||
if (sequenceId < 0) {
|
||||
ALOGE("Camera %s submit request remote failure: ret %d", getId(), sequenceId);
|
||||
return ACAMERA_ERROR_UNKNOWN;
|
||||
}
|
||||
|
||||
CallbackHolder cbHolder(session, requestsV, isRepeating, cbs);
|
||||
mSequenceCallbackMap.insert(std::make_pair(sequenceId, cbHolder));
|
||||
|
||||
if (isRepeating) {
|
||||
// stopRepeating above should have cleanup repeating sequence id
|
||||
if (mRepeatingSequenceId != REQUEST_ID_NONE) {
|
||||
setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_DEVICE);
|
||||
return ACAMERA_ERROR_CAMERA_DEVICE;
|
||||
}
|
||||
mRepeatingSequenceId = sequenceId;
|
||||
} else {
|
||||
mSequenceLastFrameNumberMap.insert(std::make_pair(sequenceId, lastFrameNumber));
|
||||
}
|
||||
|
||||
if (mIdle) {
|
||||
sp<AMessage> msg = new AMessage(kWhatSessionStateCb, mHandler);
|
||||
msg->setPointer(kContextKey, session->mUserSessionCallback.context);
|
||||
msg->setObject(kSessionSpKey, session);
|
||||
msg->setPointer(kCallbackFpKey, (void*) session->mUserSessionCallback.onActive);
|
||||
postSessionMsgAndCleanup(msg);
|
||||
}
|
||||
mIdle = false;
|
||||
mBusySession = session;
|
||||
|
||||
if (captureSequenceId) {
|
||||
*captureSequenceId = sequenceId;
|
||||
}
|
||||
return ACAMERA_OK;
|
||||
}
|
||||
|
||||
} // namespace acam
|
||||
} // namespace android
|
||||
@ -0,0 +1,152 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
#include <inttypes.h>
|
||||
#include <android/frameworks/cameraservice/service/2.0/ICameraService.h>
|
||||
#include <android/frameworks/cameraservice/device/2.0/types.h>
|
||||
#include <CameraMetadata.h>
|
||||
|
||||
#include "ndk_vendor/impl/ACameraDevice.h"
|
||||
#include "ACameraCaptureSession.h"
|
||||
#include "ACameraMetadata.h"
|
||||
#include "ACaptureRequest.h"
|
||||
#include "utils.h"
|
||||
|
||||
using namespace android;
|
||||
|
||||
namespace android {
|
||||
namespace acam {
|
||||
|
||||
template<class T>
|
||||
camera_status_t
|
||||
CameraDevice::captureLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
return submitRequestsLocked(
|
||||
session, cbs, numRequests, requests, captureSequenceId, /*isRepeating*/false);
|
||||
}
|
||||
|
||||
template<class T>
|
||||
camera_status_t
|
||||
CameraDevice::setRepeatingRequestsLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*optional*/int* captureSequenceId) {
|
||||
return submitRequestsLocked(
|
||||
session, cbs, numRequests, requests, captureSequenceId, /*isRepeating*/true);
|
||||
}
|
||||
|
||||
template<class T>
|
||||
camera_status_t CameraDevice::submitRequestsLocked(
|
||||
sp<ACameraCaptureSession> session,
|
||||
/*optional*/T* cbs,
|
||||
int numRequests, ACaptureRequest** requests,
|
||||
/*out*/int* captureSequenceId,
|
||||
bool isRepeating)
|
||||
{
|
||||
camera_status_t ret = checkCameraClosedOrErrorLocked();
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Camera %s submit capture request failed! ret %d", getId(), ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Form two vectors of capture request, one for internal tracking
|
||||
std::vector<frameworks::cameraservice::device::V2_0::CaptureRequest> requestList;
|
||||
Vector<sp<CaptureRequest>> requestsV;
|
||||
requestsV.setCapacity(numRequests);
|
||||
for (int i = 0; i < numRequests; i++) {
|
||||
sp<CaptureRequest> req;
|
||||
ret = allocateCaptureRequest(requests[i], req);
|
||||
// We need to call this method since after submitRequestList is called,
|
||||
// the request metadata queue might have removed the capture request
|
||||
// metadata. Therefore we simply add the metadata to its wrapper class,
|
||||
// so that it can be retrieved later.
|
||||
addRequestSettingsMetadata(requests[i], req);
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Convert capture request to internal format failure! ret %d", ret);
|
||||
return ret;
|
||||
}
|
||||
if (req->mCaptureRequest.streamAndWindowIds.size() == 0) {
|
||||
ALOGE("Capture request without output target cannot be submitted!");
|
||||
return ACAMERA_ERROR_INVALID_PARAMETER;
|
||||
}
|
||||
requestList.push_back(utils::convertToHidl(req.get()));
|
||||
requestsV.push_back(req);
|
||||
}
|
||||
if (isRepeating) {
|
||||
ret = stopRepeatingLocked();
|
||||
if (ret != ACAMERA_OK) {
|
||||
ALOGE("Camera %s stop repeating failed! ret %d", getId(), ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
SubmitInfo info;
|
||||
Status status;
|
||||
auto remoteRet = mRemote->submitRequestList(requestList, isRepeating,
|
||||
[&status, &info](auto s, auto &submitInfo) {
|
||||
status = s;
|
||||
info = submitInfo;
|
||||
});
|
||||
if (!remoteRet.isOk()) {
|
||||
ALOGE("%s: Transaction error for submitRequestList call: %s", __FUNCTION__,
|
||||
remoteRet.description().c_str());
|
||||
}
|
||||
if (status != Status::NO_ERROR) {
|
||||
return utils::convertFromHidl(status);
|
||||
}
|
||||
int32_t sequenceId = info.requestId;
|
||||
int64_t lastFrameNumber = info.lastFrameNumber;
|
||||
if (sequenceId < 0) {
|
||||
ALOGE("Camera %s submit request remote failure: ret %d", getId(), sequenceId);
|
||||
return ACAMERA_ERROR_UNKNOWN;
|
||||
}
|
||||
|
||||
CallbackHolder cbHolder(session, requestsV, isRepeating, cbs);
|
||||
mSequenceCallbackMap.insert(std::make_pair(sequenceId, cbHolder));
|
||||
if (isRepeating) {
|
||||
// stopRepeating above should have cleanup repeating sequence id
|
||||
if (mRepeatingSequenceId != REQUEST_ID_NONE) {
|
||||
setCameraDeviceErrorLocked(ACAMERA_ERROR_CAMERA_DEVICE);
|
||||
return ACAMERA_ERROR_CAMERA_DEVICE;
|
||||
}
|
||||
mRepeatingSequenceId = sequenceId;
|
||||
} else {
|
||||
mSequenceLastFrameNumberMap.insert(std::make_pair(sequenceId, lastFrameNumber));
|
||||
}
|
||||
|
||||
if (mIdle) {
|
||||
sp<AMessage> msg = new AMessage(kWhatSessionStateCb, mHandler);
|
||||
msg->setPointer(kContextKey, session->mUserSessionCallback.context);
|
||||
msg->setObject(kSessionSpKey, session);
|
||||
msg->setPointer(kCallbackFpKey, (void*) session->mUserSessionCallback.onActive);
|
||||
postSessionMsgAndCleanup(msg);
|
||||
}
|
||||
mIdle = false;
|
||||
mBusySession = session;
|
||||
|
||||
if (captureSequenceId) {
|
||||
*captureSequenceId = sequenceId;
|
||||
}
|
||||
return ACAMERA_OK;
|
||||
}
|
||||
|
||||
} // namespace acam
|
||||
} // namespace android
|
||||
Loading…
Reference in new issue