Snap for 12651823 from a0b8ea24dc4bd5994a2ff1c5eb0e316957111710 to 25Q1-release (d43613a4) · Commits · e / os / android_frameworks_av

apex/ld.config.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ namespace.default.links = platform
		# TODO: replace the following when apex has a way to auto-generate this list
		# namespace.default.link.platform.shared_libs = %LLNDK_LIBRARIES%
		# namespace.default.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
		namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libbinder_ndk.so
		namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libbinder_ndk.so

		###############################################################################
		# "platform" namespace
		@@ -138,7 +138,7 @@ namespace.sphal.links = platform
		# TODO: replace the following when apex has a way to auto-generate this list
		# namespace.sphal.link.platform.shared_libs = %LLNDK_LIBRARIES%
		# namespace.sphal.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
		namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libbinder_ndk.so
		namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libbinder_ndk.so

		# Add a link for libz.so which is llndk on devices where VNDK is not enforced.
		namespace.sphal.link.platform.shared_libs += libz.so

camera/CameraUtils.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ namespace android {
		const char *kCameraServiceDisabledProperty = "config.disable_cameraservice";

		status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo,
		int mirrorMode, /out/int32_t* transform) {
		int mirrorMode, bool enableTransformInverseDisplay, /out/int32_t* transform) {
		ALOGV("%s", __FUNCTION__);

		if (transform == NULL) {
		@@ -128,7 +128,9 @@ status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo,
		* aspect ratio, or the preview will end up looking non-uniformly
		* stretched.
		*/
		if (enableTransformInverseDisplay) {
		flags \|= NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;
		}

		ALOGV("%s: final transform = 0x%x", __FUNCTION__, flags);

camera/include/camera/CameraUtils.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ class CameraUtils {
		* Returns OK on success, or a negative error code.
		*/
		static status_t getRotationTransform(const CameraMetadata& staticInfo,
		int mirrorMode, /out/int32_t* transform);
		int mirrorMode, bool enableTransformInverseDisplay, /out/int32_t* transform);

		/**
		* Check if the image data is VideoNativeHandleMetadata, that contains a native handle.

camera/ndk/include/camera/NdkCameraMetadataTags.h

+22 −0

Original line number	Diff line number	Diff line
		@@ -9750,6 +9750,28 @@ typedef enum acamera_metadata_enum_acamera_control_low_light_boost_state {

		} acamera_metadata_enum_android_control_low_light_boost_state_t;

		// ACAMERA_CONTROL_ZOOM_METHOD
		typedef enum acamera_metadata_enum_acamera_control_zoom_method {
		/**
		* <p>The camera device automatically detects whether the application does zoom with
		* ACAMERA_SCALER_CROP_REGION or ACAMERA_CONTROL_ZOOM_RATIO, and in turn decides which
		* metadata tag reflects the effective zoom level.</p>
		*
		* @see ACAMERA_CONTROL_ZOOM_RATIO
		* @see ACAMERA_SCALER_CROP_REGION
		*/
		ACAMERA_CONTROL_ZOOM_METHOD_AUTO = 0,

		/**
		* <p>The application intends to control zoom via ACAMERA_CONTROL_ZOOM_RATIO, and
		* the effective zoom level is reflected by ACAMERA_CONTROL_ZOOM_RATIO in capture results.</p>
		*
		* @see ACAMERA_CONTROL_ZOOM_RATIO
		*/
		ACAMERA_CONTROL_ZOOM_METHOD_ZOOM_RATIO = 1,

		} acamera_metadata_enum_android_control_zoom_method_t;

		// ACAMERA_CONTROL_AE_PRIORITY_MODE
		typedef enum acamera_metadata_enum_acamera_control_ae_priority_mode {
		/**

camera/tests/fuzzer/camera_utils_fuzzer.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ void CameraUtilsFuzzer::invokeCameraUtils() {

		CameraUtils::getRotationTransform(
		staticMetadata, mFDP->ConsumeIntegral<int32_t>() /* mirrorMode */,
		true /enableTransformInverseDisplay/,
		&transform /out/);
		},
		[&]() { CameraUtils::isCameraServiceDisabled(); },