Camera: More fixes on assert() within functions
Flag: TEST_ONLY
Bug: 399939768
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: I10a22704955894c71f723d15a3f1399281203b3f
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
index 92f69bd..e2c7208 100644
--- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
+++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
@@ -1628,10 +1628,10 @@
Stream previewStream;
std::shared_ptr<DeviceCb> cb;
- configurePreviewStreams(
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStreams(
name, mProvider, &previewThreshold, physicalIds, &mSession, &previewStream,
&halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &halBufManagedStreamIds /*out*/, &cb /*out*/, 0 /*streamConfigCounter*/, true);
+ &halBufManagedStreamIds /*out*/, &cb /*out*/, 0 /*streamConfigCounter*/, true));
if (mSession == nullptr) {
// stream combination not supported by HAL, skip test for device
continue;
@@ -2244,10 +2244,10 @@
Stream previewStream;
std::vector<HalStream> halStreams;
std::shared_ptr<DeviceCb> cb;
- configurePreviewStream(name, mProvider, &previewThreshold, &mSession /*out*/,
- &previewStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStream(
+ name, mProvider, &previewThreshold, &mSession /*out*/, &previewStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
::aidl::android::hardware::common::fmq::MQDescriptor<
int8_t, aidl::android::hardware::common::fmq::SynchronizedReadWrite>
@@ -2373,10 +2373,10 @@
bool supportsPartialResults = false;
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configurePreviewStream(name, mProvider, &previewThreshold, &mSession /*out*/,
- &previewStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStream(
+ name, mProvider, &previewThreshold, &mSession /*out*/, &previewStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
ASSERT_NE(mSession, nullptr);
ASSERT_FALSE(halStreams.empty());
@@ -2637,10 +2637,10 @@
bool supportsPartialResults = false;
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configurePreviewStream(name, mProvider, &previewThreshold, &mSession /*out*/,
- &previewStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStream(
+ name, mProvider, &previewThreshold, &mSession /*out*/, &previewStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
RequestTemplate reqTemplate = RequestTemplate::PREVIEW;
ndk::ScopedAStatus ret = mSession->constructDefaultRequestSettings(reqTemplate, &settings);
@@ -2692,10 +2692,10 @@
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configurePreviewStream(name, mProvider, &previewThreshold, &mSession /*out*/,
- &previewStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStream(
+ name, mProvider, &previewThreshold, &mSession /*out*/, &previewStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
ASSERT_NE(mSession, nullptr);
ASSERT_NE(cb, nullptr);
@@ -2817,10 +2817,10 @@
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configurePreviewStream(name, mProvider, &previewThreshold, &mSession /*out*/,
- &previewStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configurePreviewStream(
+ name, mProvider, &previewThreshold, &mSession /*out*/, &previewStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
ndk::ScopedAStatus returnStatus = mSession->flush();
ASSERT_TRUE(returnStatus.isOk());
diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp
index 75ad532..2bdd5e8 100644
--- a/camera/provider/aidl/vts/camera_aidl_test.cpp
+++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -2296,14 +2296,10 @@
bool supportsPartialResults = false;
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configureSingleStream(name, mProvider, &streamThreshold, bufferUsage, reqTemplate,
- &session /*out*/, &testStream /*out*/, &halStreams /*out*/,
- &supportsPartialResults /*out*/, &partialResultCount /*out*/,
- &useHalBufManager /*out*/, &cb /*out*/);
-
- ASSERT_NE(session, nullptr);
- ASSERT_NE(cb, nullptr);
- ASSERT_FALSE(halStreams.empty());
+ ASSERT_NO_FATAL_FAILURE(configureSingleStream(
+ name, mProvider, &streamThreshold, bufferUsage, reqTemplate, &session /*out*/,
+ &testStream /*out*/, &halStreams /*out*/, &supportsPartialResults /*out*/,
+ &partialResultCount /*out*/, &useHalBufManager /*out*/, &cb /*out*/));
std::shared_ptr<ResultMetadataQueue> resultQueue;
::aidl::android::hardware::common::fmq::MQDescriptor<
@@ -2718,37 +2714,37 @@
config.streams = streams;
createStreamConfiguration(streams, StreamConfigurationMode::NORMAL_MODE, &config,
jpegBufferSize);
- if (*session != nullptr) {
- CameraMetadata sessionParams;
- ret = (*session)->constructDefaultRequestSettings(reqTemplate, &sessionParams);
- ASSERT_TRUE(ret.isOk());
- config.sessionParams = sessionParams;
- config.streamConfigCounter = (int32_t)streamConfigCounter;
- bool supported = false;
- ret = device->isStreamCombinationSupported(config, &supported);
- ASSERT_TRUE(ret.isOk());
- ASSERT_EQ(supported, true);
+ CameraMetadata sessionParams;
+ ret = (*session)->constructDefaultRequestSettings(reqTemplate, &sessionParams);
+ ASSERT_TRUE(ret.isOk());
+ config.sessionParams = sessionParams;
+ config.streamConfigCounter = (int32_t)streamConfigCounter;
- std::vector<HalStream> halConfigs;
- std::set<int32_t> halBufManagedStreamIds;
- ret = configureStreams(*session, config, bufferManagerType, &halBufManagedStreamIds,
- &halConfigs);
- ALOGI("configureStreams returns status: %d:%d", ret.getExceptionCode(),
- ret.getServiceSpecificError());
- ASSERT_TRUE(ret.isOk());
- ASSERT_EQ(1u, halConfigs.size());
- halStreams->clear();
- halStreams->push_back(halConfigs[0]);
- *useHalBufManager = halBufManagedStreamIds.size() != 0;
- if (*useHalBufManager) {
- std::vector<Stream> ss(1);
- std::vector<HalStream> hs(1);
- ss[0] = config.streams[0];
- hs[0] = halConfigs[0];
- (*cb)->setCurrentStreamConfig(ss, hs);
- }
+ bool supported = false;
+ ret = device->isStreamCombinationSupported(config, &supported);
+ ASSERT_TRUE(ret.isOk());
+ ASSERT_EQ(supported, true);
+
+ std::vector<HalStream> halConfigs;
+ std::set<int32_t> halBufManagedStreamIds;
+ ret = configureStreams(*session, config, bufferManagerType, &halBufManagedStreamIds,
+ &halConfigs);
+ ALOGI("configureStreams returns status: %d:%d", ret.getExceptionCode(),
+ ret.getServiceSpecificError());
+ ASSERT_TRUE(ret.isOk());
+ ASSERT_EQ(1u, halConfigs.size());
+ halStreams->clear();
+ halStreams->push_back(halConfigs[0]);
+ *useHalBufManager = halBufManagedStreamIds.size() != 0;
+ if (*useHalBufManager) {
+ std::vector<Stream> ss(1);
+ std::vector<HalStream> hs(1);
+ ss[0] = config.streams[0];
+ hs[0] = halConfigs[0];
+ (*cb)->setCurrentStreamConfig(ss, hs);
}
+
*previewStream = config.streams[0];
ASSERT_TRUE(ret.isOk());
}
@@ -2808,10 +2804,11 @@
bool supportsPartialResults = false;
bool useHalBufManager = false;
int32_t partialResultCount = 0;
- configureSingleStream(name, mProvider, &streamThreshold, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
- RequestTemplate::PREVIEW, &session /*out*/, &testStream /*out*/,
- &halStreams /*out*/, &supportsPartialResults /*out*/,
- &partialResultCount /*out*/, &useHalBufManager /*out*/, &cb /*out*/);
+ ASSERT_NO_FATAL_FAILURE(configureSingleStream(
+ name, mProvider, &streamThreshold, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
+ RequestTemplate::PREVIEW, &session /*out*/, &testStream /*out*/,
+ &halStreams /*out*/, &supportsPartialResults /*out*/, &partialResultCount /*out*/,
+ &useHalBufManager /*out*/, &cb /*out*/));
::aidl::android::hardware::common::fmq::MQDescriptor<
int8_t, aidl::android::hardware::common::fmq::SynchronizedReadWrite>
@@ -3570,10 +3567,10 @@
Stream* previewStream, std::vector<HalStream>* halStreams, bool* supportsPartialResults,
int32_t* partialResultCount, bool* useHalBufManager, std::shared_ptr<DeviceCb>* cb,
uint32_t streamConfigCounter) {
- configureSingleStream(name, provider, previewThreshold, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
- RequestTemplate::PREVIEW, session, previewStream, halStreams,
- supportsPartialResults, partialResultCount, useHalBufManager, cb,
- streamConfigCounter);
+ ASSERT_NO_FATAL_FAILURE(configureSingleStream(
+ name, provider, previewThreshold, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
+ RequestTemplate::PREVIEW, session, previewStream, halStreams, supportsPartialResults,
+ partialResultCount, useHalBufManager, cb, streamConfigCounter));
}
Status CameraAidlTest::isOfflineSessionSupported(const camera_metadata_t* staticMeta) {