Merge "Merge Android 12" (92da43cc) · Commits · e / os / android_frameworks_av

Android.bp

+63 −15

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2021 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.

		// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
		// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
		// DEPENDING ON IT IN YOUR PROJECT. ***
		@@ -48,3 +33,66 @@ license {
		"NOTICE",
		],
		}

		aidl_interface {
		name: "av-types-aidl",
		unstable: true,
		host_supported: true,
		vendor_available: true,
		double_loadable: true,
		local_include_dir: "aidl",
		srcs: [
		"aidl/android/media/InterpolatorConfig.aidl",
		"aidl/android/media/InterpolatorType.aidl",
		"aidl/android/media/MicrophoneInfoData.aidl",
		"aidl/android/media/VolumeShaperConfiguration.aidl",
		"aidl/android/media/VolumeShaperConfigurationOptionFlag.aidl",
		"aidl/android/media/VolumeShaperConfigurationType.aidl",
		"aidl/android/media/VolumeShaperOperation.aidl",
		"aidl/android/media/VolumeShaperOperationFlag.aidl",
		"aidl/android/media/VolumeShaperState.aidl",
		],
		backend: {
		cpp: {
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth.updatable",
		"com.android.media",
		"com.android.media.swcodec",
		],
		},
		},
		}

		cc_library_headers {
		name: "av-headers",
		export_include_dirs: ["include"],
		static_libs: [
		"av-types-aidl-cpp",
		],
		export_static_lib_headers: [
		"av-types-aidl-cpp",
		],
		header_libs: [
		"libaudioclient_aidl_conversion_util",
		],
		export_header_lib_headers: [
		"libaudioclient_aidl_conversion_util",
		],
		host_supported: true,
		vendor_available: true,
		double_loadable: true,
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth.updatable",
		"com.android.media",
		"com.android.media.swcodec",
		],
		target: {
		darwin: {
		enabled: false,
		},
		},
		}

MainlineFiles.cfg

+7 −10

Original line number	Diff line number	Diff line
		#
		# mainline files for frameworks/av
		# this list used by tools/mainline_hook_*.sh to help separate
		# mainline changes vs framework changes, which release at different paces.
		#
		#
		# ignore comment (#) lines and blank lines
		# rest are path prefixes starting at root of the project
		@@ -24,11 +27,5 @@
		media/codec2/components/
		media/codecs/
		media/extractors/
		media/libstagefright/codecs/amrnb/
		media/libstagefright/codecs/amrwb/
		media/libstagefright/codecs/amrwbenc/
		media/libstagefright/codecs/common/
		media/libstagefright/codecs/flac/
		media/libstagefright/codecs/m4v_h263/
		media/libstagefright/codecs/mp3dec/
		media/libstagefright/mpeg2ts
		media/libstagefright/mpeg2ts/
		media/libstagefright/flac/

PREUPLOAD.cfg

+8 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,11 @@ mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO

		hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

		[Builtin Hooks]
		clang_format = true

		[Builtin Hooks Options]
		# Only turn on clang-format check for the following subfolders.
		clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		media/libmediatranscoding/
		services/mediatranscoding/

aidl/android/media/InterpolatorConfig.aidl

0 → 100644

+31 −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.
		*/

		package android.media;

		import android.media.InterpolatorType;

		/**
		* {@hide}
		*/
		parcelable InterpolatorConfig {
		InterpolatorType type = InterpolatorType.CUBIC;
		/** For cubic interpolation, the boundary conditions in slope. */
		float firstSlope;
		float lastSlope;
		/** A flattened list of <x, y> pairs, monotonically increasing in x. */
		float[] xy;
		}

aidl/android/media/InterpolatorType.aidl

0 → 100644

+34 −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.
		*/
		package android.media;

		/**
		* Polynomial spline interpolators.
		*
		* {@hide}
		*/
		@Backing(type="int")
		enum InterpolatorType {
		/** Not continuous. */
		STEP,
		/** C0. */
		LINEAR,
		/** C1. */
		CUBIC,
		/** C1 (to provide locally monotonic curves). */
		CUBIC_MONOTONIC,
		// CUBIC_C2, // TODO - requires global computation / cache
		}