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

Commit 1c2b0d52 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioEffect JNI: use new max preprocessing constant 

Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit b27a8a5b)
parent d7044fe1

media/jni/audioeffect/android_media_AudioEffect.cpp

+2 −18
Original line number Diff line number Diff line
@@ -785,28 +785,12 @@ queryEffects_failure: 
static jobjectArray

android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz, jint audioSession)

{

    // kDefaultNumEffects is a "reasonable" value ensuring that only one query will be enough on

    // most devices to get all active audio pre processing on a given session.

    static const uint32_t kDefaultNumEffects = 5;



    effect_descriptor_t *descriptors = new effect_descriptor_t[kDefaultNumEffects];

    uint32_t numEffects = kDefaultNumEffects;

    effect_descriptor_t *descriptors = new effect_descriptor_t[AudioEffect::kMaxPreProcessing];

    uint32_t numEffects = AudioEffect::kMaxPreProcessing;



    status_t status = AudioEffect::queryDefaultPreProcessing(audioSession,

                                           descriptors,

                                           &numEffects);

    if ((status != NO_ERROR && status != NO_MEMORY) ||

            numEffects == 0) {

        delete[] descriptors;

        return NULL;

    }

    if (status == NO_MEMORY) {

        delete [] descriptors;

        descriptors = new effect_descriptor_t[numEffects];

        status = AudioEffect::queryDefaultPreProcessing(audioSession,

                                               descriptors,

                                               &numEffects);

    }

    if (status != NO_ERROR || numEffects == 0) {

        delete[] descriptors;

        return NULL;