drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioEffect types in SDK" into jb-mr2-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2013-03-27 17:35:44 +00:00
committed by Android (Google) Code Review
parent 972a9255a7 80569f7ff7
commit f2b0fdb2f7
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@ -12246,6 +12246,14 @@ package android.media.audiofx {
field public static final int CONTENT_TYPE_VOICE = 3; // 0x3 field public static final int CONTENT_TYPE_VOICE = 3; // 0x3
field public static final java.lang.String EFFECT_AUXILIARY = "Auxiliary"; field public static final java.lang.String EFFECT_AUXILIARY = "Auxiliary";
field public static final java.lang.String EFFECT_INSERT = "Insert"; field public static final java.lang.String EFFECT_INSERT = "Insert";
field public static final java.util.UUID EFFECT_TYPE_AEC;
field public static final java.util.UUID EFFECT_TYPE_AGC;
field public static final java.util.UUID EFFECT_TYPE_BASS_BOOST;
field public static final java.util.UUID EFFECT_TYPE_ENV_REVERB;
field public static final java.util.UUID EFFECT_TYPE_EQUALIZER;
field public static final java.util.UUID EFFECT_TYPE_NS;
field public static final java.util.UUID EFFECT_TYPE_PRESET_REVERB;
field public static final java.util.UUID EFFECT_TYPE_VIRTUALIZER;
field public static final int ERROR = -1; // 0xffffffff field public static final int ERROR = -1; // 0xffffffff
field public static final int ERROR_BAD_VALUE = -4; // 0xfffffffc field public static final int ERROR_BAD_VALUE = -4; // 0xfffffffc
field public static final int ERROR_DEAD_OBJECT = -7; // 0xfffffff9 field public static final int ERROR_DEAD_OBJECT = -7; // 0xfffffff9

36
media/java/android/media/audiofx/AudioEffect.java
View File

@ -72,55 +72,49 @@ public class AudioEffect {
* specification. The definitions match the corresponding interface IDs in * specification. The definitions match the corresponding interface IDs in
* OpenSLES_IID.h * OpenSLES_IID.h
*/ */
/** /**
* UUID for environmental reverb effect * UUID for environmental reverberation effect
* @hide
*/ */
public static final UUID EFFECT_TYPE_ENV_REVERB = UUID public static final UUID EFFECT_TYPE_ENV_REVERB = UUID
.fromString("c2e5d5f0-94bd-4763-9cac-4e234d06839e"); .fromString("c2e5d5f0-94bd-4763-9cac-4e234d06839e");
/** /**
* UUID for preset reverb effect * UUID for preset reverberation effect
* @hide
*/ */
public static final UUID EFFECT_TYPE_PRESET_REVERB = UUID public static final UUID EFFECT_TYPE_PRESET_REVERB = UUID
.fromString("47382d60-ddd8-11db-bf3a-0002a5d5c51b"); .fromString("47382d60-ddd8-11db-bf3a-0002a5d5c51b");
/** /**
* UUID for equalizer effect * UUID for equalizer effect
* @hide
*/ */
public static final UUID EFFECT_TYPE_EQUALIZER = UUID public static final UUID EFFECT_TYPE_EQUALIZER = UUID
.fromString("0bed4300-ddd6-11db-8f34-0002a5d5c51b"); .fromString("0bed4300-ddd6-11db-8f34-0002a5d5c51b");
/** /**
* UUID for bass boost effect * UUID for bass boost effect
* @hide
*/ */
public static final UUID EFFECT_TYPE_BASS_BOOST = UUID public static final UUID EFFECT_TYPE_BASS_BOOST = UUID
.fromString("0634f220-ddd4-11db-a0fc-0002a5d5c51b"); .fromString("0634f220-ddd4-11db-a0fc-0002a5d5c51b");
/** /**
* UUID for virtualizer effect * UUID for virtualizer effect
* @hide
*/ */
public static final UUID EFFECT_TYPE_VIRTUALIZER = UUID public static final UUID EFFECT_TYPE_VIRTUALIZER = UUID
.fromString("37cc2c00-dddd-11db-8577-0002a5d5c51b"); .fromString("37cc2c00-dddd-11db-8577-0002a5d5c51b");
/** /**
* UUID for Automatic Gain Control (AGC) audio pre-processing * UUIDs for effect types not covered by OpenSL ES.
* @hide */
/**
* UUID for Automatic Gain Control (AGC)
*/ */
public static final UUID EFFECT_TYPE_AGC = UUID public static final UUID EFFECT_TYPE_AGC = UUID
.fromString("0a8abfe0-654c-11e0-ba26-0002a5d5c51b"); .fromString("0a8abfe0-654c-11e0-ba26-0002a5d5c51b");
/** /**
* UUID for Acoustic Echo Canceler (AEC) audio pre-processing * UUID for Acoustic Echo Canceler (AEC)
* @hide
*/ */
public static final UUID EFFECT_TYPE_AEC = UUID public static final UUID EFFECT_TYPE_AEC = UUID
.fromString("7b491460-8d4d-11e0-bd61-0002a5d5c51b"); .fromString("7b491460-8d4d-11e0-bd61-0002a5d5c51b");
/** /**
* UUID for Noise Suppressor (NS) audio pre-processing * UUID for Noise Suppressor (NS)
* @hide
*/ */
public static final UUID EFFECT_TYPE_NS = UUID public static final UUID EFFECT_TYPE_NS = UUID
.fromString("58b4b260-8e06-11e0-aa8e-0002a5d5c51b"); .fromString("58b4b260-8e06-11e0-aa8e-0002a5d5c51b");
@ -199,7 +193,7 @@ public class AudioEffect {
* The effect descriptor contains information on a particular effect implemented in the * The effect descriptor contains information on a particular effect implemented in the
* audio framework:<br> * audio framework:<br>
* <ul> * <ul>
* <li>type: UUID corresponding to the OpenSL ES interface implemented by this effect</li> * <li>type: UUID identifying the effect type</li>
* <li>uuid: UUID for this particular implementation</li> * <li>uuid: UUID for this particular implementation</li>
* <li>connectMode: {@link #EFFECT_INSERT}, {@link #EFFECT_AUXILIARY} or * <li>connectMode: {@link #EFFECT_INSERT}, {@link #EFFECT_AUXILIARY} or
* {at_link #EFFECT_PRE_PROCESSING}</li> * {at_link #EFFECT_PRE_PROCESSING}</li>
@ -224,8 +218,14 @@ public class AudioEffect {
} }
/** /**
* Indicates the generic type of the effect (Equalizer, Bass boost ...). The UUID * Indicates the generic type of the effect (Equalizer, Bass boost ...).
* corresponds to the OpenSL ES Interface ID for this type of effect. * One of {@link AudioEffect#EFFECT_TYPE_AEC},
* {@link AudioEffect#EFFECT_TYPE_AGC}, {@link AudioEffect#EFFECT_TYPE_BASS_BOOST},
* {@link AudioEffect#EFFECT_TYPE_ENV_REVERB}, {@link AudioEffect#EFFECT_TYPE_EQUALIZER},
* {@link AudioEffect#EFFECT_TYPE_NS}, {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB}
* or {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}.<br>
* For reverberation, bass boost, EQ and virtualizer, the UUID
* corresponds to the OpenSL ES Interface ID.
*/ */
public UUID type; public UUID type;
/** /**
@ -440,7 +440,7 @@ public class AudioEffect {
} }
/** /**
* Query all audio pre processing effects applied to the AudioRecord with the supplied * Query all audio pre-processing effects applied to the AudioRecord with the supplied
* audio session ID. Returns an array of {@link android.media.audiofx.AudioEffect.Descriptor} * audio session ID. Returns an array of {@link android.media.audiofx.AudioEffect.Descriptor}
* objects. * objects.
* @param audioSession system wide unique audio session identifier. * @param audioSession system wide unique audio session identifier.