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

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

Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev

parents dd125329 0078c7cc

core/jni/android_media_AudioSystem.cpp

+6 −2
Original line number Diff line number Diff line
@@ -613,8 +613,12 @@ static jint convertAudioPortConfigFromNative(JNIEnv *env, 
                goto exit;

            }

        }

        //TODO: replace popcount by audio utils function mask to count

        int numValues = popcount(nAudioPortConfig->gain.channel_mask);

        int numValues;

        if (useInMask) {

            numValues = audio_channel_count_from_in_mask(nAudioPortConfig->gain.channel_mask);

        } else {

            numValues = audio_channel_count_from_out_mask(nAudioPortConfig->gain.channel_mask);

        }

        jGainValues = env->NewIntArray(numValues);

        if (jGainValues == NULL) {

            ALOGV("convertAudioPortConfigFromNative could not create gain values %d", numValues);