Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba7ef0b1 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioEffect: add missing values to Descriptor.connectMode"

parents 614a7316 7afef8a2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -27650,6 +27650,8 @@ package android.media.audiofx { 
    field public static final int CONTENT_TYPE_VOICE = 3; // 0x3

    field public static final String EFFECT_AUXILIARY = "Auxiliary";

    field public static final String EFFECT_INSERT = "Insert";

    field public static final String EFFECT_POST_PROCESSING = "Post Processing";

    field public static final String EFFECT_PRE_PROCESSING = "Pre Processing";

    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;

core/jni/android_media_AudioEffectDescriptor.cpp

+15 −11
Original line number Diff line number Diff line
@@ -39,16 +39,20 @@ jint convertAudioEffectDescriptorFromNative(JNIEnv* env, jobject* jDescriptor, 
    jstring jImplementor;

    char str[EFFECT_STRING_LEN_MAX];



    if ((nDescriptor->flags & EFFECT_FLAG_TYPE_MASK)

        == EFFECT_FLAG_TYPE_AUXILIARY) {

    switch (nDescriptor->flags & EFFECT_FLAG_TYPE_MASK) {

        case EFFECT_FLAG_TYPE_AUXILIARY:

            jConnect = env->NewStringUTF("Auxiliary");

    } else if ((nDescriptor->flags & EFFECT_FLAG_TYPE_MASK)

        == EFFECT_FLAG_TYPE_INSERT) {

            break;

        case EFFECT_FLAG_TYPE_INSERT:

            jConnect = env->NewStringUTF("Insert");

    } else if ((nDescriptor->flags & EFFECT_FLAG_TYPE_MASK)

        == EFFECT_FLAG_TYPE_PRE_PROC) {

            break;

        case EFFECT_FLAG_TYPE_PRE_PROC:

            jConnect = env->NewStringUTF("Pre Processing");

    } else {

            break;

        case EFFECT_FLAG_TYPE_POST_PROC:

            jConnect = env->NewStringUTF("Post Processing");

            break;

        default:

            return (jint)AUDIO_JAVA_BAD_VALUE;

    }

media/java/android/media/audiofx/AudioEffect.java

+6 −2
Original line number Diff line number Diff line
@@ -356,10 +356,14 @@ public class AudioEffect { 
    public static final String EFFECT_AUXILIARY = "Auxiliary";

    /**

     * Effect connection mode is pre processing.

     * The audio pre processing effects are attached to an audio input (AudioRecord).

     * @hide

     * The audio pre processing effects are attached to an audio input stream or device

     */

    public static final String EFFECT_PRE_PROCESSING = "Pre Processing";

    /**

     * Effect connection mode is post processing.

     * The audio post processing effects are attached to an audio output stream or device

     */

    public static final String EFFECT_POST_PROCESSING = "Post Processing";



    // --------------------------------------------------------------------------

    // Member variables