Camera: some patchs for offline processing

Test: CTS OfflineSessionTest
Bug: 135142453

Change-Id: I09a19b3b2e366855ed35b588f75f9734f505072c
gugelfrei
Yin-Chia Yeh 4 years ago committed by Emilian Peev
parent 2496ffbc45
commit 87fcccad5d

@ -2005,7 +2005,8 @@ binder::Status CameraDeviceClient::switchToOffline(
return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string()); return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
} }
std::vector<int32_t> offlineStreamIds(offlineOutputIds.size()); std::vector<int32_t> offlineStreamIds;
offlineStreamIds.reserve(offlineOutputIds.size());
KeyedVector<sp<IBinder>, sp<CompositeStream>> offlineCompositeStreamMap; KeyedVector<sp<IBinder>, sp<CompositeStream>> offlineCompositeStreamMap;
for (const auto& streamId : offlineOutputIds) { for (const auto& streamId : offlineOutputIds) {
ssize_t index = mConfiguredOutputs.indexOfKey(streamId); ssize_t index = mConfiguredOutputs.indexOfKey(streamId);

@ -167,7 +167,9 @@ status_t Camera3OfflineSession::disconnectImpl() {
streams.push_back(mInputStream); streams.push_back(mInputStream);
} }
mSession->close(); if (mSession != nullptr) {
mSession->close();
}
FlushInflightReqStates states { FlushInflightReqStates states {
mId, mOfflineReqsLock, mOfflineReqs, mUseHalBufManager, mId, mOfflineReqsLock, mOfflineReqs, mUseHalBufManager,

@ -40,7 +40,8 @@ class ZoomRatioMapper : private CoordinateMapper {
bool supportNativeZoomRatio, bool usePrecorrectArray); bool supportNativeZoomRatio, bool usePrecorrectArray);
ZoomRatioMapper(const ZoomRatioMapper& other) : ZoomRatioMapper(const ZoomRatioMapper& other) :
mHalSupportsZoomRatio(other.mHalSupportsZoomRatio), mHalSupportsZoomRatio(other.mHalSupportsZoomRatio),
mArrayWidth(other.mArrayWidth), mArrayHeight(other.mArrayHeight) {} mArrayWidth(other.mArrayWidth), mArrayHeight(other.mArrayHeight),
mIsValid(other.mIsValid) {}
/** /**
* Initialize request template with valid zoomRatio if necessary. * Initialize request template with valid zoomRatio if necessary.

Loading…
Cancel
Save