preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-04 13:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android 4.2+: Ask for optimal audio buffer size + sample rate. Ignore sample rate for now.

Browse Source
This commit is contained in:
Henrik Rydgard committed 2013-06-19 14:27:50 +02:00
1 parent 9f510771bd
commit 0e5cab2b0c
9 files changed
+89 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/app-android.cpp
+19 -8
View File
@@ -42,6 +42,9 @@ static float right_joystick_y_async;
static uint32_t pad_buttons_down;
int optimalFramesPerBuffer = 0;
int optimalSampleRate = 0;
// Android implementation of callbacks to the Java part of the app
void SystemToast(const char *text) {
frameCommand = "toast";
@@ -93,7 +96,7 @@ InputState input_state;
static bool renderer_inited = false;
static bool first_lost = true;
static bool use_native_audio = false;
static bool use_opensl_audio = false;
std::string GetJavaString(JNIEnv *env, jstring jstr)
{
@@ -119,6 +122,12 @@ extern "C" jboolean Java_com_henrikrydgard_libnative_NativeApp_isAtTopLevel(JNIE
return NativeIsAtTopLevel();
}
extern "C" void Java_com_henrikrydgard_libnative_NativeApp_audioConfig
(JNIEnv *env, jclass, jint optimalFPB, jint optimalSR) {
optimalFramesPerBuffer = optimalFPB;
optimalSampleRate = optimalSR;
}
extern "C" void Java_com_henrikrydgard_libnative_NativeApp_init
(JNIEnv *env, jclass, jint xxres, jint yyres, jint dpi, jstring japkpath,
jstring jdataDir, jstring jexternalDir, jstring jlibraryDir, jstring jinstallID, jboolean juseNativeAudio) {
@@ -167,24 +176,26 @@ extern "C" void Java_com_henrikrydgard_libnative_NativeApp_init
const char *argv[2] = {app_name.c_str(), 0};
NativeInit(1, argv, user_data_path.c_str(), externalDir.c_str(), installID.c_str());
use_native_audio = juseNativeAudio;
if (use_native_audio) {
ILOG("Using OpenSL audio!");
AndroidAudio_Init(&NativeMix, library_path);
use_opensl_audio = juseNativeAudio;
if (use_opensl_audio) {
// TODO: PPSSPP doesn't support 48khz yet so let's not use that yet.
ILOG("Using OpenSL audio! frames/buffer: %i optimal sr: %i actual sr: 44100", optimalFramesPerBuffer, optimalSampleRate);
optimalSampleRate = 44100;
AndroidAudio_Init(&NativeMix, library_path, optimalFramesPerBuffer, optimalSampleRate);
}
ILOG("NativeApp.init() -- end");
}
extern "C" void Java_com_henrikrydgard_libnative_NativeApp_resume(JNIEnv *, jclass) {
ILOG("NativeApp.resume() - resuming audio");
if (use_native_audio) {
if (use_opensl_audio) {
AndroidAudio_Resume();
}
}
extern "C" void Java_com_henrikrydgard_libnative_NativeApp_pause(JNIEnv *, jclass) {
ILOG("NativeApp.pause() - pausing audio");
if (use_native_audio) {
if (use_opensl_audio) {
AndroidAudio_Pause();
}
ILOG("NativeApp.pause() - paused audio");
@@ -192,7 +203,7 @@ extern "C" void Java_com_henrikrydgard_libnative_NativeApp_pause(JNIEnv *, jclas
extern "C" void Java_com_henrikrydgard_libnative_NativeApp_shutdown(JNIEnv *, jclass) {
ILOG("NativeApp.shutdown() -- begin");
if (use_native_audio) {
if (use_opensl_audio) {
AndroidAudio_Shutdown();
}
if (renderer_inited) {