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

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

Merge "audio: fixed channel count determination from channel mask"

parents df0697e3 dbf55665

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
        ALOGE("Error creating AudioRecord: channel mask %#x is not valid.", channelMask);

        return (jint) AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK;

    }

    uint32_t channelCount = popcount(channelMask);

    uint32_t channelCount = audio_channel_count_from_in_mask(channelMask);



    // compare the format against the Java constants

    audio_format_t format = audioFormatToNative(audioFormat);

core/jni/android_media_AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
        return (jint) AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK;

    }



    uint32_t channelCount = popcount(nativeChannelMask);

    uint32_t channelCount = audio_channel_count_from_out_mask(nativeChannelMask);



    // check the format.

    // This function was called from Java, so we compare the format against the Java constants