Merge "Camera: More fixes on assert() within functions" into main (cca21ca9) · Commits · e / os / android_hardware_interfaces

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+22 −22

Original line number	Diff line number	Diff line
		@@ -1628,10 +1628,10 @@ TEST_P(CameraAidlTest, processMultiCaptureRequestPreview) {
		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 @@ TEST_P(CameraAidlTest, processCaptureRequestBurstISO) {
		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 @@ TEST_P(CameraAidlTest, processCaptureRequestInvalidSinglePreview) {
		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 @@ TEST_P(CameraAidlTest, processCaptureRequestInvalidBuffer) {
		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 @@ TEST_P(CameraAidlTest, flushPreviewRequest) {
		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 @@ TEST_P(CameraAidlTest, flushEmpty) {
		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());

camera/provider/aidl/vts/camera_aidl_test.cpp

+41 −44

Original line number	Diff line number	Diff line
		@@ -2296,14 +2296,10 @@ void CameraAidlTest::processCaptureRequestInternal(uint64_t bufferUsage,
		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,7 +2714,7 @@ void CameraAidlTest::configureSingleStream(
		config.streams = streams;
		createStreamConfiguration(streams, StreamConfigurationMode::NORMAL_MODE, &config,
		jpegBufferSize);
		if (*session != nullptr) {

		CameraMetadata sessionParams;
		ret = (*session)->constructDefaultRequestSettings(reqTemplate, &sessionParams);
		ASSERT_TRUE(ret.isOk());
		@@ -2748,7 +2744,7 @@ void CameraAidlTest::configureSingleStream(
		hs[0] = halConfigs[0];
		(*cb)->setCurrentStreamConfig(ss, hs);
		}
		}

		*previewStream = config.streams[0];
		ASSERT_TRUE(ret.isOk());
		}
		@@ -2808,10 +2804,11 @@ void CameraAidlTest::processPreviewStabilizationCaptureRequestInternal(
		bool supportsPartialResults = false;
		bool useHalBufManager = false;
		int32_t partialResultCount = 0;
		configureSingleStream(name, mProvider, &streamThreshold, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
		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/);
		&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 @@ void CameraAidlTest::configurePreviewStream(
		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) {