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

Commit df878bd3 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new...

am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant

* commit 'ced2f74a':
  AudioEffect JNI: use new max preprocessing constant
parents 7c570346 ced2f74a
Loading
Loading
Loading
Loading
+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;