Merge "Effect AIDL: Add back some effect parameters." (903e6d82) · Commits · e / os / android_hardware_interfaces

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Equalizer.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ union Equalizer {
		android.hardware.audio.effect.VendorExtension vendorExtension;
		android.hardware.audio.effect.Equalizer.BandLevel[] bandLevels;
		int preset;
		int[] centerFreqMh;
		@VintfStability
		union Id {
		int vendorExtensionTag;

+3 −3

Original line number	Diff line number	Diff line
		@@ -48,9 +48,9 @@ union HapticGenerator {
		}
		@Backing(type="int") @VintfStability
		enum VibratorScale {
		MUTE = (-100),
		VERY_LOW = (-2),
		LOW = (-1),
		MUTE = (-100) /* -100 */,
		VERY_LOW = (-2) /* -2 */,
		LOW = (-1) /* -1 */,
		NONE = 0,
		HIGH = 1,
		VERY_HIGH = 2,

+6 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ package android.hardware.audio.effect;
		union NoiseSuppression {
		android.hardware.audio.effect.VendorExtension vendor;
		android.hardware.audio.effect.NoiseSuppression.Level level;
		android.hardware.audio.effect.NoiseSuppression.Type type;
		@VintfStability
		union Id {
		int vendorExtensionTag;
		@@ -52,4 +53,9 @@ union NoiseSuppression {
		HIGH,
		VERY_HIGH,
		}
		@Backing(type="int") @VintfStability
		enum Type {
		SINGLE_CHANNEL,
		MULTI_CHANNEL,
		}
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -36,10 +36,18 @@ package android.hardware.audio.effect;
		union Virtualizer {
		android.hardware.audio.effect.VendorExtension vendor;
		int strengthPm;
		android.hardware.audio.effect.Virtualizer.ChannelAngle[] speakerAngles;
		android.media.audio.common.AudioDeviceDescription device;
		@VintfStability
		union Id {
		int vendorExtensionTag;
		android.hardware.audio.effect.Virtualizer.Tag commonTag;
		android.hardware.audio.effect.Virtualizer.SpeakerAnglesPayload speakerAnglesPayload;
		}
		@VintfStability
		parcelable SpeakerAnglesPayload {
		android.media.audio.common.AudioChannelLayout layout;
		android.media.audio.common.AudioDeviceDescription device;
		}
		@VintfStability
		parcelable Capability {
		@@ -47,4 +55,10 @@ union Virtualizer {
		int maxStrengthPm;
		boolean strengthSupported;
		}
		@VintfStability
		parcelable ChannelAngle {
		int channel;
		int azimuthDegree;
		int elevationDegree;
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ union Equalizer {
		}

		/**
		* Supported minimal and maximal frequency for each band in millihertz.
		* Supported minimal and maximal frequency for each band in milliHertz.
		*/
		@VintfStability
		parcelable BandFrequency {
		@@ -97,8 +97,14 @@ union Equalizer {
		* Level for each band.
		*/
		BandLevel[] bandLevels;

		/**
		* Index of current preset.
		*/
		int preset;

		/**
		* Get only parameter, get the center frequency for all bands in milliHertz.
		*/
		int[] centerFreqMh;
		}