Snap for 6626121 from 494c937d7878400fa3ffaf7151a350fb8bca7a8e to rvc-release (76edbfb7) · Commits · e / os / android_hardware_interfaces

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

+16 −3

Original line number	Diff line number	Diff line
		@@ -843,7 +843,7 @@ public:

		void verifyRequestTemplate(const camera_metadata_t* metadata, RequestTemplate requestTemplate);

		bool isDepthOnly(camera_metadata_t* staticMeta);
		static bool isDepthOnly(const camera_metadata_t* staticMeta);

		static Status getAvailableOutputStreams(const camera_metadata_t *staticMeta,
		std::vector<AvailableStream> &outputStreams,
		@@ -5537,9 +5537,22 @@ static Size getMinSize(Size a, Size b) {
		// TODO: Add more combinations
		Status CameraHidlTest::getMandatoryConcurrentStreams(const camera_metadata_t* staticMeta,
		std::vector<AvailableStream>* outputStreams) {
		if (nullptr == staticMeta) {
		if (nullptr == staticMeta \|\| nullptr == outputStreams) {
		return Status::ILLEGAL_ARGUMENT;
		}

		if (isDepthOnly(staticMeta)) {
		Size y16MaxSize(640, 480);
		Size maxAvailableY16Size;
		getMaxOutputSizeForFormat(staticMeta, PixelFormat::Y16, &maxAvailableY16Size);
		Size y16ChosenSize = getMinSize(y16MaxSize, maxAvailableY16Size);
		AvailableStream y16Stream = {.width = y16ChosenSize.width,
		.height = y16ChosenSize.height,
		.format = static_cast<int32_t>(PixelFormat::Y16)};
		outputStreams->push_back(y16Stream);
		return Status::OK;
		}

		Size yuvMaxSize(1280, 720);
		Size jpegMaxSize(1920, 1440);
		Size maxAvailableYuvSize;
		@@ -6296,7 +6309,7 @@ void CameraHidlTest::configureOfflineStillStream(const std::string &name,
		ASSERT_TRUE(ret.isOk());
		}

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

camera/provider/2.6/ICameraProvider.hal

+6 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,12 @@ interface ICameraProvider extends @2.5::ICameraProvider {
		* outputs, stream combinations mentioned above, where YUV is substituted by
		* Y8 must be also supported.
		*
		* Devices whose capabilities do not include
		* ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE, must support
		* at least a single Y16 stream, Dataspace::DEPTH with sVGA resolution,
		* during concurrent operation.
		* Where sVGA - min (max output resolution for the given format, 640 X 480)
		*
		* The camera framework must call this method whenever it gets a
		* cameraDeviceStatusChange callback adding a new camera device or removing
		* a camera device known to it. This is so that the camera framework can get new combinations

current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -677,7 +677,7 @@ eb90c4d366f05a025d1d1a3672f8b4c3e33e420fa387f73f21b264645bfdf845 android.hardwar
		a718c8a3acaa938de5a57923e8c4625ed7ca051e05a1d930ba6998557d7b57c8 android.hardware.camera.device@3.6::ICameraOfflineSession
		a35d5151b48505f06a775b38c0e2e265f80a845d92802324c643565807f81c53 android.hardware.camera.device@3.6::types
		02bdf82dba7dce273a554b4474468a8fb1fb4f61ab65da95eb16e080df63fff6 android.hardware.camera.metadata@3.5::types
		7d6b362681f4a4fd0be95535d8913d8de9a26f0765c1bdda4bd837dea8c25db6 android.hardware.camera.provider@2.6::ICameraProvider
		93cd94e47b22007bbf436c2f5c2703bb7b2859d1b714d6ae15520db55667ba6c android.hardware.camera.provider@2.6::ICameraProvider
		8f8d9463508ff9cae88eb35c429fd0e2dbca0ca8f5de7fdf836cc0c4370becb6 android.hardware.camera.provider@2.6::ICameraProviderCallback
		1edf7aef68ef3bd577a1175b1462fb82e3e39f01c6915dda61fba121028df283 android.hardware.camera.provider@2.6::types
		c1aa508d00b66ed5feefea398fd5edf28fa651ac89773adad7dfda4e0a73a952 android.hardware.cas@1.2::ICas

graphics/composer/2.1/vts/functional/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ cc_test {
		shared_libs: [
		"libfmq",
		"libsync",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.mapper@2.1",
		"android.hardware.graphics.mapper@3.0",
		"android.hardware.graphics.mapper@4.0",
		],
		static_libs: [
		"android.hardware.graphics.allocator@2.0",
		@@ -30,13 +34,9 @@ cc_test {
		"android.hardware.graphics.allocator@4.0",
		"android.hardware.graphics.composer@2.1",
		"android.hardware.graphics.composer@2.1-vts",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.mapper@2.0-vts",
		"android.hardware.graphics.mapper@2.1",
		"android.hardware.graphics.mapper@2.1-vts",
		"android.hardware.graphics.mapper@3.0",
		"android.hardware.graphics.mapper@3.0-vts",
		"android.hardware.graphics.mapper@4.0",
		"android.hardware.graphics.mapper@4.0-vts",
		],
		header_libs: [

graphics/composer/2.2/vts/functional/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -33,6 +33,10 @@ cc_test {
		"libprocessgroup",
		"libsync",
		"libui",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.mapper@2.1",
		"android.hardware.graphics.mapper@3.0",
		"android.hardware.graphics.mapper@4.0",
		],
		static_libs: [
		"android.hardware.graphics.allocator@2.0",
		@@ -43,13 +47,9 @@ cc_test {
		"android.hardware.graphics.composer@2.1-vts",
		"android.hardware.graphics.composer@2.2",
		"android.hardware.graphics.composer@2.2-vts",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.mapper@2.0-vts",
		"android.hardware.graphics.mapper@2.1",
		"android.hardware.graphics.mapper@2.1-vts",
		"android.hardware.graphics.mapper@3.0",
		"android.hardware.graphics.mapper@3.0-vts",
		"android.hardware.graphics.mapper@4.0",
		"android.hardware.graphics.mapper@4.0-vts",
		"libgtest",
		"librenderengine",