Snap for 6142138 from 31f98910412ed7e023ffb240c49de63f958fd226 to rvc-release (371a7bc5) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+23 −1

Original line number	Diff line number	Diff line
		@@ -2509,6 +2509,11 @@ typedef enum acamera_metadata_tag {
		* <p><code>p' = Rp</code></p>
		* <p>where <code>p</code> is in the device sensor coordinate system, and
		* <code>p'</code> is in the camera-oriented coordinate system.</p>
		* <p>If ACAMERA_LENS_POSE_REFERENCE is UNDEFINED, the quaternion rotation cannot
		* be accurately represented by the camera device, and will be represented by
		* default values matching its default facing.</p>
		*
		* @see ACAMERA_LENS_POSE_REFERENCE
		*/
		ACAMERA_LENS_POSE_ROTATION = // float[4]
		ACAMERA_LENS_START + 6,
		@@ -2549,6 +2554,8 @@ typedef enum acamera_metadata_tag {
		* <p>When ACAMERA_LENS_POSE_REFERENCE is GYROSCOPE, then this position is relative to
		* the center of the primary gyroscope on the device. The axis definitions are the same as
		* with PRIMARY_CAMERA.</p>
		* <p>When ACAMERA_LENS_POSE_REFERENCE is UNDEFINED, this position cannot be accurately
		* represented by the camera device, and will be represented as <code>(0, 0, 0)</code>.</p>
		*
		* @see ACAMERA_LENS_DISTORTION
		* @see ACAMERA_LENS_INTRINSIC_CALIBRATION
		@@ -2691,8 +2698,10 @@ typedef enum acamera_metadata_tag {
		ACAMERA_LENS_RADIAL_DISTORTION = // Deprecated! DO NOT USE
		ACAMERA_LENS_START + 11,
		/**
		* <p>The origin for ACAMERA_LENS_POSE_TRANSLATION.</p>
		* <p>The origin for ACAMERA_LENS_POSE_TRANSLATION, and the accuracy of
		* ACAMERA_LENS_POSE_TRANSLATION and ACAMERA_LENS_POSE_ROTATION.</p>
		*
		* @see ACAMERA_LENS_POSE_ROTATION
		* @see ACAMERA_LENS_POSE_TRANSLATION
		*
		* <p>Type: byte (acamera_metadata_enum_android_lens_pose_reference_t)</p>
		@@ -7539,6 +7548,19 @@ typedef enum acamera_metadata_enum_acamera_lens_pose_reference {
		*/
		ACAMERA_LENS_POSE_REFERENCE_GYROSCOPE = 1,

		/**
		* <p>The camera device cannot represent the values of ACAMERA_LENS_POSE_TRANSLATION
		* and ACAMERA_LENS_POSE_ROTATION accurately enough. One such example is a camera device
		* on the cover of a foldable phone: in order to measure the pose translation and rotation,
		* some kind of hinge position sensor would be needed.</p>
		* <p>The value of ACAMERA_LENS_POSE_TRANSLATION must be all zeros, and
		* ACAMERA_LENS_POSE_ROTATION must be values matching its default facing.</p>
		*
		* @see ACAMERA_LENS_POSE_ROTATION
		* @see ACAMERA_LENS_POSE_TRANSLATION
		*/
		ACAMERA_LENS_POSE_REFERENCE_UNDEFINED = 2,

		} acamera_metadata_enum_android_lens_pose_reference_t;

media/extractors/Android.bp

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2020 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		cc_defaults {
		name: "extractor-defaults_no-sanitizer",

		include_dirs: [
		"frameworks/av/media/libstagefright/include",
		],

		shared_libs: [
		"liblog",
		"libmediandk#29",
		],

		relative_install_path: "extractors",

		compile_multilib: "first",

		cflags: [
		"-Werror",
		"-Wall",
		"-fvisibility=hidden",
		],

		version_script: "exports.lds",
		}

		cc_defaults {
		name: "extractor-defaults",

		defaults: ["extractor-defaults_no-sanitizer"],

		sanitize: {
		cfi: true,
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		},
		}
		No newline at end of file

media/extractors/aac/Android.bp

+2 −29

Original line number	Diff line number	Diff line
		cc_library {
		name: "libaacextractor",
		defaults: ["extractor-defaults"],

		srcs: ["AACExtractor.cpp"],

		include_dirs: [
		"frameworks/av/media/libstagefright/",
		],

		shared_libs: [
		"liblog",
		"libmediandk",
		],

		static_libs: [
		"libstagefright_foundation",
		"libstagefright_metadatautils",
		"libutils",
		],

		name: "libaacextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",

		cflags: [
		"-Werror",
		"-Wall",
		"-fvisibility=hidden",
		],
		version_script: "exports.lds",

		sanitize: {
		cfi: true,
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		},

		}

media/extractors/amr/Android.bp

+2 −29

Original line number	Diff line number	Diff line
		cc_library {
		name: "libamrextractor",
		defaults: ["extractor-defaults"],

		srcs: ["AMRExtractor.cpp"],

		include_dirs: [
		"frameworks/av/media/libstagefright/include",
		],

		shared_libs: [
		"liblog",
		"libmediandk",
		],

		static_libs: [
		"libstagefright_foundation",
		],

		name: "libamrextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",

		cflags: [
		"-Werror",
		"-Wall",
		"-fvisibility=hidden",
		],
		version_script: "exports.lds",

		sanitize: {
		cfi: true,
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		},

		}

media/extractors/flac/Android.bp

+2 −23

Original line number	Diff line number	Diff line
		cc_library {
		name: "libflacextractor",
		defaults: ["extractor-defaults"],

		srcs: ["FLACExtractor.cpp"],

		include_dirs: [
		"frameworks/av/media/libstagefright/include",
		"external/flac/include",
		],

		shared_libs: [
		"libbinder_ndk",
		"liblog",
		"libmediandk",
		],

		static_libs: [
		@@ -21,24 +20,4 @@ cc_library {
		"libutils",
		],

		name: "libflacextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",

		cflags: [
		"-Werror",
		"-Wall",
		"-fvisibility=hidden",
		],
		version_script: "exports.lds",

		sanitize: {
		cfi: true,
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		},

		}