Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to use the system sample rate with Android

Browse Source
This commit is contained in:
Chris Robinson
2017-01-26 18:23:29 -08:00
parent 3ba03c5a29
commit 67ffdf7a78
1 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/backends/opensl.c
+55 -5
View File
@@ -22,9 +22,11 @@
#include "config.h"
#include <stdlib.h>
#include <jni.h>
#include "alMain.h"
#include "alu.h"
#include "compat.h"
#include "threads.h"
#include <SLES/OpenSLES.h>
@@ -231,16 +233,64 @@ static ALCboolean opensl_reset_playback(ALCdevice *Device)
SLDataFormat_PCM format_pcm;
SLDataSource audioSrc;
SLDataSink audioSnk;
ALuint sampleRate;
SLInterfaceID id;
SLboolean req;
SLresult result;
SLboolean req;
if((Device->Flags&DEVICE_FREQUENCY_REQUEST))
sampleRate = Device->Frequency;
else
{
JNIEnv *env = Android_GetJNIEnv();
Device->UpdateSize = (ALuint64)Device->UpdateSize * 44100 / Device->Frequency;
Device->UpdateSize = Device->UpdateSize * Device->NumUpdates / 2;
Device->NumUpdates = 2;
/* Get necessary stuff for using java.lang.Integer,
* android.content.Context, and android.media.AudioManager.
*/
jclass int_cls = JCALL(env,FindClass)("java/lang/Integer");
jmethodID int_parseint = JCALL(env,GetStaticMethodID)(int_cls,
"parseInt", "(Ljava/lang/String;)I"
);
Device->Frequency = 44100;
jclass ctx_cls = (*env)->FindClass(env, "android/content/Context");
jfieldID ctx_audsvc = (*env)->GetStaticFieldID(env, ctx_cls,
"AUDIO_SERVICE", "Ljava/lang/String;"
);
jmethodID ctx_getSysSvc = (*env)->GetMethodID(env, ctx_cls,
"getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;"
);
jclass audmgr_cls = JCALL(env,FindClass)("android/media/AudioManager");
jfieldID audmgr_prop_out_srate = JCALL(env,GetStaticFieldID)(audmgr_cls,
"PROPERTY_OUTPUT_SAMPLE_RATE", "Ljava/lang/String;"
);
jmethodID audmgr_getproperty = JCALL(env,GetMethodID)(audmgr_cls,
"getProperty", "(Ljava/lang/String;)Ljava/lang/Object;"
);
/* Now make the calls. */
//AudioManager audMgr = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
jobject audMgr = JCALL(env,CallStaticObjectMethod)(ctx_cls, ctx_getSysSvc,
JCALL(env,GetStaticObjectField)(ctx_cls, ctx_audsvc)
);
//String srateStr = audMgr.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
jstring srateStr = JCALL(env,CallObjectMethod)(audMgr, audmgr_getproperty,
JCALL(env,GetStaticObjectField)(audmgr_cls, audmgr_prop_out_srate)
);
//int sampleRate = Integer.parseInt(srateStr);
sampleRate = JCALL(env,CallStaticIntMethod)(int_cls, int_parseint, srateStr);
if(!sampleRate) sampleRate = Device->Frequency;
else sampleRate = maxu(sampleRate, MIN_OUTPUT_RATE);
}
if(sampleRate != Device->Frequency)
{
Device->NumUpdates = Device->NumUpdates * sampleRate / Device->Frequency;
Device->Frequency = sampleRate;
}
Device->FmtChans = DevFmtStereo;
Device->FmtType = DevFmtShort;