Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" (c158dbcd) · Commits · e / os / android_hardware_interfaces

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+109 −20

Original line number	Diff line number	Diff line
		@@ -671,6 +671,7 @@ public:
		HalStreamConfiguration halStreamConfig /out*/,
		bool supportsPartialResults /out*/,
		uint32_t partialResultCount /out*/);
		bool isDepthOnly(camera_metadata_t* staticMeta);
		static Status getAvailableOutputStreams(camera_metadata_t *staticMeta,
		std::vector<AvailableStream> &outputStreams,
		const AvailableStream *threshold = nullptr);
		@@ -682,6 +683,10 @@ public:
		std::unordered_set<std::string> physicalIds/out*/);
		static Status getSupportedKeys(camera_metadata_t *staticMeta,
		uint32_t tagId, std::unordered_set<int32_t> requestIDs/out*/);
		static void fillOutputStreams(camera_metadata_ro_entry_t* entry,
		std::vector<AvailableStream>& outputStreams,
		const AvailableStream *threshold = nullptr,
		const int32_t availableConfigOutputTag = 0u);
		static void constructFilteredSettings(const sp<ICameraDeviceSession>& session,
		const std::unordered_set<int32_t>& availableKeys, RequestTemplate reqTemplate,
		android::hardware::camera::common::V1_0::helper::CameraMetadata* defaultSettings/out/,
		@@ -2521,14 +2526,24 @@ TEST_F(CameraHidlTest, configureStreamsAvailableOutputs) {
		int32_t streamId = 0;
		for (auto& it : outputStreams) {
		V3_2::Stream stream3_2;
		bool isJpeg = static_cast<PixelFormat>(it.format) == PixelFormat::BLOB;
		V3_2::DataspaceFlags dataspaceFlag = 0;
		switch (static_cast<PixelFormat>(it.format)) {
		case PixelFormat::BLOB:
		dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF);
		break;
		case PixelFormat::Y16:
		dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
		break;
		default:
		dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
		}
		stream3_2 = {streamId,
		StreamType::OUTPUT,
		static_cast<uint32_t>(it.width),
		static_cast<uint32_t>(it.height),
		static_cast<PixelFormat>(it.format),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
		(isJpeg) ? static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF) : 0,
		dataspaceFlag,
		StreamRotation::ROTATION_0};
		::android::hardware::hidl_vec<V3_2::Stream> streams3_2 = {stream3_2};
		::android::hardware::camera::device::V3_4::StreamConfiguration config3_4;
		@@ -2962,6 +2977,14 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) {
		openEmptyDeviceSession(name, mProvider, &session /out/, &staticMeta /out/);
		castSession(session, deviceVersion, &session3_3, &session3_4);

		// Check if camera support depth only
		if (isDepthOnly(staticMeta)) {
		free_camera_metadata(staticMeta);
		ret = session->close();
		ASSERT_TRUE(ret.isOk());
		continue;
		}

		outputBlobStreams.clear();
		ASSERT_EQ(Status::OK,
		getAvailableOutputStreams(staticMeta, outputBlobStreams,
		@@ -3230,6 +3253,14 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) {
		openEmptyDeviceSession(name, mProvider, &session /out/, &staticMeta /out/);
		castSession(session, deviceVersion, &session3_3, &session3_4);

		// Check if camera support depth only
		if (isDepthOnly(staticMeta)) {
		free_camera_metadata(staticMeta);
		ret = session->close();
		ASSERT_TRUE(ret.isOk());
		continue;
		}

		outputBlobStreams.clear();
		ASSERT_EQ(Status::OK,
		getAvailableOutputStreams(staticMeta, outputBlobStreams,
		@@ -4135,38 +4166,56 @@ TEST_F(CameraHidlTest, flushEmpty) {
		Status CameraHidlTest::getAvailableOutputStreams(camera_metadata_t *staticMeta,
		std::vector<AvailableStream> &outputStreams,
		const AvailableStream *threshold) {
		AvailableStream depthPreviewThreshold = {kMaxPreviewWidth, kMaxPreviewHeight,
		static_cast<int32_t>(PixelFormat::Y16)};
		if (nullptr == staticMeta) {
		return Status::ILLEGAL_ARGUMENT;
		}

		camera_metadata_ro_entry entry;
		int rc = find_camera_metadata_ro_entry(staticMeta,
		ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, &entry);
		if ((0 != rc) \|\| (0 != (entry.count % 4))) {
		camera_metadata_ro_entry scalarEntry;
		camera_metadata_ro_entry depthEntry;
		int foundScalar = find_camera_metadata_ro_entry(staticMeta,
		ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, &scalarEntry);
		int foundDepth = find_camera_metadata_ro_entry(staticMeta,
		ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS, &depthEntry);
		if ((0 != foundScalar \|\| (0 != (scalarEntry.count % 4))) &&
		(0 != foundDepth \|\| (0 != (depthEntry.count % 4)))) {
		return Status::ILLEGAL_ARGUMENT;
		}

		for (size_t i = 0; i < entry.count; i+=4) {
		if (ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT ==
		entry.data.i32[i + 3]) {
		if(foundScalar == 0 && (0 == (scalarEntry.count % 4))) {
		fillOutputStreams(&scalarEntry, outputStreams, threshold,
		ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
		}

		if(foundDepth == 0 && (0 == (depthEntry.count % 4))) {
		fillOutputStreams(&depthEntry, outputStreams, &depthPreviewThreshold,
		ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_OUTPUT);
		}

		return Status::OK;
		}

		void CameraHidlTest::fillOutputStreams(camera_metadata_ro_entry_t* entry,
		std::vector<AvailableStream>& outputStreams, const AvailableStream* threshold,
		const int32_t availableConfigOutputTag) {
		for (size_t i = 0; i < entry->count; i+=4) {
		if (availableConfigOutputTag == entry->data.i32[i + 3]) {
		if(nullptr == threshold) {
		AvailableStream s = {entry.data.i32[i+1],
		entry.data.i32[i+2], entry.data.i32[i]};
		AvailableStream s = {entry->data.i32[i+1],
		entry->data.i32[i+2], entry->data.i32[i]};
		outputStreams.push_back(s);
		} else {
		if ((threshold->format == entry.data.i32[i]) &&
		(threshold->width >= entry.data.i32[i+1]) &&
		(threshold->height >= entry.data.i32[i+2])) {
		AvailableStream s = {entry.data.i32[i+1],
		entry.data.i32[i+2], threshold->format};
		if ((threshold->format == entry->data.i32[i]) &&
		(threshold->width >= entry->data.i32[i+1]) &&
		(threshold->height >= entry->data.i32[i+2])) {
		AvailableStream s = {entry->data.i32[i+1],
		entry->data.i32[i+2], threshold->format};
		outputStreams.push_back(s);
		}
		}
		}

		}

		return Status::OK;
		}

		// Get max jpeg buffer size in android.jpeg.maxSize
		@@ -4563,6 +4612,37 @@ void CameraHidlTest::configurePreviewStreams3_4(const std::string &name, int32_t
		ASSERT_TRUE(ret.isOk());
		}

		bool CameraHidlTest::isDepthOnly(camera_metadata_t* staticMeta) {
		camera_metadata_ro_entry scalarEntry;
		camera_metadata_ro_entry depthEntry;

		int rc = find_camera_metadata_ro_entry(
		staticMeta, ANDROID_REQUEST_AVAILABLE_CAPABILITIES, &scalarEntry);
		if (rc == 0) {
		for (uint32_t i = 0; i < scalarEntry.count; i++) {
		if (scalarEntry.data.u8[i] == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE) {
		return false;
		}
		}
		}

		for (uint32_t i = 0; i < scalarEntry.count; i++) {
		if (scalarEntry.data.u8[i] == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT) {

		rc = find_camera_metadata_ro_entry(
		staticMeta, ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS, &depthEntry);
		size_t i = 0;
		if (rc == 0 && depthEntry.data.i32[i] == static_cast<int32_t>(PixelFormat::Y16)) {
		// only Depth16 format is supported now
		return true;
		}
		break;
		}
		}

		return false;
		}

		// Open a device session and configure a preview stream.
		void CameraHidlTest::configurePreviewStream(const std::string &name, int32_t deviceVersion,
		sp<ICameraProvider> provider,
		@@ -4638,11 +4718,20 @@ void CameraHidlTest::configurePreviewStream(const std::string &name, int32_t dev
		ASSERT_EQ(Status::OK, rc);
		ASSERT_FALSE(outputPreviewStreams.empty());

		V3_2::DataspaceFlags dataspaceFlag = 0;
		switch (static_cast<PixelFormat>(outputPreviewStreams[0].format)) {
		case PixelFormat::Y16:
		dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
		break;
		default:
		dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
		}

		V3_2::Stream stream3_2 = {0, StreamType::OUTPUT,
		static_cast<uint32_t> (outputPreviewStreams[0].width),
		static_cast<uint32_t> (outputPreviewStreams[0].height),
		static_cast<PixelFormat> (outputPreviewStreams[0].format),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0};
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, dataspaceFlag, StreamRotation::ROTATION_0};
		::android::hardware::hidl_vec<V3_2::Stream> streams3_2 = {stream3_2};
		::android::hardware::camera::device::V3_2::StreamConfiguration config3_2;
		::android::hardware::camera::device::V3_4::StreamConfiguration config3_4;

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

+30 −8

Original line number	Diff line number	Diff line
		@@ -387,17 +387,28 @@ void changeStateLoadedtoIdle(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		OMX_StateIdle);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

		OMX_PARAM_PORTDEFINITIONTYPE portDefInput;
		OMX_PARAM_PORTDEFINITIONTYPE portDefOutput;
		status = getPortParam(omxNode, OMX_IndexParamPortDefinition, kPortIndexInput, &portDefInput);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		status = getPortParam(omxNode, OMX_IndexParamPortDefinition, kPortIndexOutput, &portDefOutput);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

		// Dont switch states until the ports are populated
		if (portDefInput.nBufferCountActual \|\| portDefOutput.nBufferCountActual) {
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);
		}

		// allocate buffers on input port
		ASSERT_NO_FATAL_FAILURE(allocatePortBuffers(
		omxNode, iBuffer, kPortIndexInput, pm[0], allocGrap));

		// Dont switch states until the ports are populated
		if (portDefOutput.nBufferCountActual) {
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);
		}

		// allocate buffers on output port
		ASSERT_NO_FATAL_FAILURE(allocatePortBuffers(
		@@ -430,9 +441,18 @@ void changeStateIdletoLoaded(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		OMX_StateLoaded);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

		OMX_PARAM_PORTDEFINITIONTYPE portDefInput;
		OMX_PARAM_PORTDEFINITIONTYPE portDefOutput;
		status = getPortParam(omxNode, OMX_IndexParamPortDefinition, kPortIndexInput, &portDefInput);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		status = getPortParam(omxNode, OMX_IndexParamPortDefinition, kPortIndexOutput, &portDefOutput);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

		// dont change state until all buffers are freed
		if (portDefInput.nBufferCountActual \|\| portDefOutput.nBufferCountActual) {
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);
		}

		for (size_t i = 0; i < iBuffer->size(); ++i) {
		status = omxNode->freeBuffer(kPortIndexInput, (*iBuffer)[i].id);
		@@ -440,8 +460,10 @@ void changeStateIdletoLoaded(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		}

		// dont change state until all buffers are freed
		if (portDefOutput.nBufferCountActual) {
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);
		}

		for (size_t i = 0; i < oBuffer->size(); ++i) {
		status = omxNode->freeBuffer(kPortIndexOutput, (*oBuffer)[i].id);

media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp

+18 −2

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		}
		if (compClass == unknown_class) disableTest = true;
		isSecure = false;
		mTunnel = false;
		size_t suffixLen = strlen(".secure");
		if (strlen(gEnv->getComponent().c_str()) >= suffixLen) {
		isSecure =
		@@ -122,6 +123,18 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		strlen(gEnv->getComponent().c_str()) - suffixLen,
		".secure");
		}
		if (compClass == video_decoder) {
		omxNode->configureVideoTunnelMode(
		1, OMX_TRUE, 0,
		[&](android::hardware::media::omx::V1_0::Status _s,
		const ::android::hardware::hidl_handle& sidebandHandle) {
		(void)sidebandHandle;
		if (_s == android::hardware::media::omx::V1_0::Status::OK)
		this->mTunnel = true;
		});
		}
		// NOTES: secure components are not covered in these tests.
		// we are disabling tests for them
		if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
		}

		@@ -149,6 +162,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		sp<CodecObserver> observer;
		sp<IOmxNode> omxNode;
		standardCompClass compClass;
		bool mTunnel;
		bool isSecure;
		bool disableTest;

		@@ -991,7 +1005,8 @@ TEST_F(ComponentHidlTest, PortEnableDisable_Idle) {
		ASSERT_NO_FATAL_FAILURE(
		changeStateLoadedtoIdle(omxNode, observer, &pBuffer[0], &pBuffer[1],
		kPortIndexInput, kPortIndexOutput, portMode));
		for (size_t i = portBase; i < portBase + 2; i++) {
		int range = mTunnel ? 1 : 2;
		for (size_t i = portBase; i < portBase + range; i++) {
		status =
		omxNode->sendCommand(toRawCommandType(OMX_CommandPortDisable), i);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);
		@@ -1104,7 +1119,8 @@ TEST_F(ComponentHidlTest, PortEnableDisable_Execute) {
		dispatchOutputBuffer(omxNode, &pBuffer[1], i, portMode[1]));
		}

		for (size_t i = portBase; i < portBase + 2; i++) {
		int range = mTunnel ? 1 : 2;
		for (size_t i = portBase; i < portBase + range; i++) {
		status =
		omxNode->sendCommand(toRawCommandType(OMX_CommandPortDisable), i);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -153,7 +153,17 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		".secure");
		}
		if (isSecure) disableTest = true;
		omxNode->configureVideoTunnelMode(
		1, OMX_TRUE, 0,
		[&](android::hardware::media::omx::V1_0::Status _s,
		const ::android::hardware::hidl_handle& sidebandHandle) {
		(void)sidebandHandle;
		if (_s == android::hardware::media::omx::V1_0::Status::OK)
		this->disableTest = true;
		});
		if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
		// NOTES: secure and tunneled components are not covered in these tests.
		// we are disabling tests for them
		}

		virtual void TearDown() override {

radio/1.0/vts/functional/sap_hidl_hal_api.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@ TEST_F(SapHidlTest, connectReq) {
		sap->connectReq(token, maxMsgSize);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(sapCb->sapResponseToken, token);

		// Modem side need time for connect to finish. Adding a waiting time to prevent
		// disconnect being requested right after connect request.
		sleep(1);
		}

		/*