Camera: Fix VTS failure for depth only camera am: 72f97643fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2523160 Change-Id: I833e3ba03270eed82ae381274f9ff704e2b80ff1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e5489ab299
2 changed files with 2 additions and 2 deletions
|
@ -6346,7 +6346,7 @@ Status CameraHidlTest::getAvailableOutputStreams(const camera_metadata_t* static
|
|||
AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,
|
||||
static_cast<int32_t>(PixelFormat::Y16)};
|
||||
const AvailableStream* depthThreshold =
|
||||
(threshold != nullptr) ? threshold : &depthPreviewThreshold;
|
||||
isDepthOnly(staticMeta) ? &depthPreviewThreshold : threshold;
|
||||
fillOutputStreams(&depthEntry, outputStreams, depthThreshold,
|
||||
ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);
|
||||
}
|
||||
|
|
|
@ -779,7 +779,7 @@ Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* static
|
|||
AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,
|
||||
static_cast<int32_t>(PixelFormat::Y16)};
|
||||
const AvailableStream* depthThreshold =
|
||||
(threshold != nullptr) ? threshold : &depthPreviewThreshold;
|
||||
isDepthOnly(staticMeta) ? &depthPreviewThreshold : threshold;
|
||||
fillOutputStreams(&depthEntry, outputStreams, depthThreshold,
|
||||
ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue