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

Commit 3245b5d1 authored by Ytai Ben-Tsvi's avatar Ytai Ben-Tsvi
Browse files

Initialize format in AudioMix conversion 

The code that converts AudioMix from Java to native previously did not
set every field of the mFormat structure, resulting in illegal data.
This adds initialization.

Test: Audio tests from CtsMediaTests
Change-Id: Id7e3ab0fdadd30100d9e78a833db2812718a764d
parent 5a5b2e3f

core/jni/android_media_AudioSystem.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1945,6 +1945,7 @@ static jint convertAudioMixToNative(JNIEnv *env, 
    nAudioMix->mCbFlags = env->GetIntField(jAudioMix, gAudioMixFields.mCallbackFlags);



    jobject jFormat = env->GetObjectField(jAudioMix, gAudioMixFields.mFormat);

    nAudioMix->mFormat = AUDIO_CONFIG_INITIALIZER;

    nAudioMix->mFormat.sample_rate = env->GetIntField(jFormat,

                                                     gAudioFormatFields.mSampleRate);

    nAudioMix->mFormat.channel_mask = outChannelMaskToNative(env->GetIntField(jFormat,