Merge changes from topic "aidlize-audioflinger" am: 754875ece8 (b9fcc869) · Commits · e / os / android_frameworks_av

Android.bp

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			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/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.media",
			],
			},
			},
			}

0 → 100644

+31 −0

Original line number	Original line	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;
			/** 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;
			}

0 → 100644

+34 −0

Original line number	Original line	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
			}

0 → 100644

+33 −0

Original line number	Original line	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.InterpolatorConfig;
			import android.media.VolumeShaperConfigurationOptionFlag;
			import android.media.VolumeShaperConfigurationType;

			/**
			* {@hide}
			*/
			parcelable VolumeShaperConfiguration {
			VolumeShaperConfigurationType type;
			int id;
			/** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */
			int optionFlags;
			double durationMs;
			InterpolatorConfig interpolatorConfig;
			}

+7 −4

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2017 The Android Open Source Project		* Copyright (C) 2020 The Android Open Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.
	@@ -13,7 +13,10 @@
	* See the License for the specific language governing permissions and		* See the License for the specific language governing permissions and
	* limitations under the License.		* limitations under the License.
	*/		*/
			package android.media;

	package android.media.VolumeShaper;		@Backing(type="int")
			enum VolumeShaperConfigurationOptionFlag {
	parcelable Operation cpp_header "media/VolumeShaper.h";		VOLUME_IN_DBFS,
			CLOCK_TIME,
			}