Some renaming and cleanup in the Android audio code

2024-10-07 19:03:29 +00:00 · 2020-07-28 14:22:50 +02:00 · 2020-07-28 14:22:50 +02:00 · aebbff55f1
commit aebbff55f1
parent b6f6e954a3
10 changed files with 84 additions and 77 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -730,10 +730,10 @@ if(ANDROID)
 		android/jni/AndroidVulkanContext.cpp
 		android/jni/AndroidVulkanContext.h
 		android/jni/AndroidGraphicsContext.h
-		android/jni/native_audio.cpp
-		android/jni/native_audio.h
-		android/jni/native-audio-so.cpp
-		android/jni/native-audio-so.h
+		android/jni/AndroidAudio.cpp
+		android/jni/AndroidAudio.h
+		android/jni/OpenSLContext.cpp
+		android/jni/OpenSLContext.h
 	)
 	# No target
 elseif(IOS)
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@ -600,7 +600,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\android\jni\native-audio-so.cpp">
+    <ClCompile Include="..\android\jni\OpenSLContext.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@ -610,7 +610,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\android\jni\native_audio.cpp">
+    <ClCompile Include="..\android\jni\AndroidAudio.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@ -1028,7 +1028,7 @@
    </ClInclude>
    <ClInclude Include="..\android\jni\ArmEmitterTest.h" />
    <ClInclude Include="..\android\jni\Arm64EmitterTest.h" />
-    <ClInclude Include="..\android\jni\native-audio-so.h">
+    <ClInclude Include="..\android\jni\OpenSLContext.h">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@ -1038,7 +1038,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
    </ClInclude>
-    <ClInclude Include="..\android\jni\native_audio.h">
+    <ClInclude Include="..\android\jni\AndroidAudio.h">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@ -205,12 +205,6 @@
    <ClCompile Include="..\android\jni\app-android.cpp">
      <Filter>Other Platforms\Android</Filter>
    </ClCompile>
-    <ClCompile Include="..\android\jni\native_audio.cpp">
-      <Filter>Other Platforms\Android</Filter>
-    </ClCompile>
-    <ClCompile Include="..\android\jni\native-audio-so.cpp">
-      <Filter>Other Platforms\Android</Filter>
-    </ClCompile>
    <ClCompile Include="..\ios\SmartKeyboardMap.cpp">
      <Filter>Other Platforms\iOS</Filter>
    </ClCompile>
@ -271,6 +265,12 @@
    <ClCompile Include="..\UWP\pch.cpp">
      <Filter>Other Platforms\UWP</Filter>
    </ClCompile>
+    <ClCompile Include="..\android\jni\AndroidAudio.cpp">
+      <Filter>Other Platforms\Android</Filter>
+    </ClCompile>
+    <ClCompile Include="..\android\jni\OpenSLContext.cpp">
+      <Filter>Other Platforms\Android</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="Debugger\CtrlDisAsmView.h">
@ -430,12 +430,6 @@
    <ClInclude Include="..\android\jni\app-android.h">
      <Filter>Other Platforms\Android</Filter>
    </ClInclude>
-    <ClInclude Include="..\android\jni\native_audio.h">
-      <Filter>Other Platforms\Android</Filter>
-    </ClInclude>
-    <ClInclude Include="..\android\jni\native-audio-so.h">
-      <Filter>Other Platforms\Android</Filter>
-    </ClInclude>
    <ClInclude Include="..\ios\ViewController.h">
      <Filter>Other Platforms\iOS</Filter>
    </ClInclude>
@ -538,6 +532,12 @@
    <ClInclude Include="..\UWP\pch.h">
      <Filter>Other Platforms\UWP</Filter>
    </ClInclude>
+    <ClInclude Include="..\android\jni\AndroidAudio.h">
+      <Filter>Other Platforms\Android</Filter>
+    </ClInclude>
+    <ClInclude Include="..\android\jni\OpenSLContext.h">
+      <Filter>Other Platforms\Android</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="icon1.ico">
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@ -499,8 +499,8 @@ LOCAL_SRC_FILES := \
  $(SRC)/android/jni/AndroidEGLContext.cpp \
  $(SRC)/android/jni/AndroidJavaGLContext.cpp \
  $(SRC)/android/jni/AndroidVulkanContext.cpp \
-  $(SRC)/android/jni/native_audio.cpp \
-  $(SRC)/android/jni/native-audio-so.cpp \
+  $(SRC)/android/jni/AndroidAudio.cpp \
+  $(SRC)/android/jni/OpenSLContext.cpp \
  $(SRC)/UI/BackgroundAudio.cpp \
  $(SRC)/UI/DiscordIntegration.cpp \
  $(SRC)/UI/ChatScreen.cpp \
--- a/android/jni/AndroidAudio.cpp
+++ b/android/jni/AndroidAudio.cpp
@ -1,6 +1,18 @@
 #include "base/logging.h"
-#include "android/jni/native_audio.h"
-#include "android/jni/native-audio-so.h"
+#include "android/jni/AndroidAudio.h"
+#include "android/jni/OpenSLContext.h"
+
+AudioContext::AudioContext(AndroidAudioCallback cb, int _FramesPerBuffer, int _SampleRate)
+	: audioCallback(cb), framesPerBuffer(_FramesPerBuffer), sampleRate(_SampleRate) {
+	if (framesPerBuffer == 0)
+		framesPerBuffer = 256;
+	if (framesPerBuffer < 32)
+		framesPerBuffer = 32;
+	if (framesPerBuffer > 4096)
+		framesPerBuffer = 4096;
+
+	sampleRate = _SampleRate;
+}

 struct AndroidAudioState {
 	AudioContext *ctx = nullptr;
--- a/android/jni/AndroidAudio.h
+++ b/android/jni/AndroidAudio.h
@ -1,8 +1,22 @@
 #pragma once

-#include "native-audio-so.h"
 #include <string>

+typedef int (*AndroidAudioCallback)(short *buffer, int num_samples);
+
+class AudioContext {
+public:
+	AudioContext(AndroidAudioCallback cb, int _FramesPerBuffer, int _SampleRate);
+	virtual bool Init() { return false; }
+	virtual ~AudioContext() {}
+
+protected:
+	AndroidAudioCallback audioCallback;
+
+	int framesPerBuffer;
+	int sampleRate;
+};
+
 struct AndroidAudioState;

 // It's okay for optimalFramesPerBuffer and optimalSampleRate to be 0. Defaults will be used.
--- a/android/jni/native-audio-so.cpp
+++ b/android/jni/native-audio-so.cpp
@ -2,8 +2,7 @@
 //
 // Loosely based on the Android NDK sample code.

-#include <assert.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>

 // for native audio
@ -11,19 +10,8 @@
 #include <SLES/OpenSLES_Android.h>

 #include "base/logging.h"
-#include "native-audio-so.h"
-
-AudioContext::AudioContext(AndroidAudioCallback cb, int _FramesPerBuffer, int _SampleRate)
-	  : audioCallback(cb), framesPerBuffer(_FramesPerBuffer), sampleRate(_SampleRate) {
-	if (framesPerBuffer == 0)
-		framesPerBuffer = 256;
-	if (framesPerBuffer < 32)
-		framesPerBuffer = 32;
-	if (framesPerBuffer > 4096)
-		framesPerBuffer = 4096;
-
-	sampleRate = _SampleRate;
-}
+#include "Common/Log.h"
+#include "OpenSLContext.h"

 // This callback handler is called every time a buffer finishes playing.
 // The documentation available is very unclear about how to best manage buffers.
@ -36,7 +24,7 @@ void OpenSLContext::bqPlayerCallbackWrap(SLAndroidSimpleBufferQueueItf bq, void

 void OpenSLContext::BqPlayerCallback(SLAndroidSimpleBufferQueueItf bq) {
 	if (bq != bqPlayerBufferQueue) {
-		ELOG("Wrong bq!");
+		ELOG("OpenSL: Wrong bq!");
 		return;
 	}

@ -53,7 +41,7 @@ void OpenSLContext::BqPlayerCallback(SLAndroidSimpleBufferQueueItf bq) {
 	// the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT,
 	// which for this code example would indicate a programming error
 	if (result != SL_RESULT_SUCCESS) {
-		ELOG("OpenSL ES: Failed to enqueue! %i %i", renderedFrames, sizeInBytes);
+		ELOG("OpenSL: Failed to enqueue! %i %i", renderedFrames, sizeInBytes);
 	}

 	curBuffer += 1; // Switch buffer
@ -70,24 +58,26 @@ bool OpenSLContext::Init() {
 	// create engine
 	result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
 	if (result != SL_RESULT_SUCCESS) {
-		ELOG("OpenSL ES: Failed to create the engine: %d", (int)result);
+		ELOG("OpenSL: Failed to create the engine: %d", (int)result);
 		engineObject = nullptr;
 		return false;
 	}
 	result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
+
 	result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
+
 	result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, 0, 0);
 	if (result != SL_RESULT_SUCCESS) {
-		ELOG("OpenSL ES: Failed to create output mix: %d", (int)result);
+		ELOG("OpenSL: Failed to create output mix: %d", (int)result);
 		(*engineObject)->Destroy(engineObject);
 		engineEngine = nullptr;
 		engineObject = nullptr;
 		return false;
 	}
 	result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);

 	// The constants, such as SL_SAMPLINGRATE_44_1, are just 44100000.
 	SLuint32 sr = (SLuint32)sampleRate * 1000;
@ -114,7 +104,7 @@ bool OpenSLContext::Init() {
 	const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
 	result = (*engineEngine)->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req);
 	if (result != SL_RESULT_SUCCESS) {
-		ELOG("OpenSL ES: CreateAudioPlayer failed: %d", (int)result);
+		ELOG("OpenSL: CreateAudioPlayer failed: %d", (int)result);
 		(*outputMixObject)->Destroy(outputMixObject);
 		outputMixObject = nullptr;

@ -126,18 +116,18 @@ bool OpenSLContext::Init() {
 	}

 	result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE,
 		&bqPlayerBufferQueue);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, &bqPlayerCallbackWrap, this);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_VOLUME, &bqPlayerVolume);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);
 	result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_(SL_RESULT_SUCCESS == result);

 	// Allocate and enqueue N empty buffers.
 	for (int i = 0; i < NUM_BUFFERS; i++) {
@ -159,7 +149,7 @@ bool OpenSLContext::Init() {
 // shut down the native audio system
 OpenSLContext::~OpenSLContext() {
 	if (bqPlayerPlay) {
-		ILOG("OpenSLWrap_Shutdown - stopping playback");
+		ILOG("OpenSL: Shutdown - stopping playback");
 		SLresult result;
 		result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_STOPPED);
 		if (SL_RESULT_SUCCESS != result) {
@ -167,7 +157,7 @@ OpenSLContext::~OpenSLContext() {
 		}
 	}

-	ILOG("OpenSLWrap_Shutdown - deleting player object");
+	ILOG("OpenSL: Shutdown - deleting player object");

 	if (bqPlayerObject) {
 		(*bqPlayerObject)->Destroy(bqPlayerObject);
@ -177,14 +167,14 @@ OpenSLContext::~OpenSLContext() {
 		bqPlayerVolume = nullptr;
 	}

-	ILOG("OpenSLWrap_Shutdown - deleting mix object");
+	ILOG("OpenSL: Shutdown - deleting mix object");

 	if (outputMixObject) {
 		(*outputMixObject)->Destroy(outputMixObject);
 		outputMixObject = nullptr;
 	}

-	ILOG("OpenSLWrap_Shutdown - deleting engine object");
+	ILOG("OpenSL: Shutdown - deleting engine object");

 	if (engineObject) {
 		(*engineObject)->Destroy(engineObject);
@ -196,6 +186,6 @@ OpenSLContext::~OpenSLContext() {
 		delete[] buffer[i];
 		buffer[i] = nullptr;
 	}
-	ILOG("OpenSLWrap_Shutdown - finished");
+	ILOG("OpenSL: Shutdown - finished");
 }	

--- a/android/jni/native-audio-so.h
+++ b/android/jni/native-audio-so.h
@ -3,20 +3,7 @@
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>

-typedef int (*AndroidAudioCallback)(short *buffer, int num_samples);
-
-class AudioContext {
-public:
-	AudioContext(AndroidAudioCallback cb, int _FramesPerBuffer, int _SampleRate);
-	virtual bool Init() { return false; }
-	virtual ~AudioContext() {}
-
-protected:
-	AndroidAudioCallback audioCallback;
-
-	int framesPerBuffer;
-	int sampleRate;
-};
+#include "AndroidAudio.h"

 class OpenSLContext : public AudioContext {
 public:
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@ -63,7 +63,7 @@ struct JNIEnv {};
 #include "math/math_util.h"
 #include "net/resolve.h"
 #include "util/text/parsers.h"
-#include "android/jni/native_audio.h"
+#include "android/jni/AndroidAudio.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"

--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@ -630,19 +630,22 @@ public abstract class NativeActivity extends Activity {
 			}
 			Log.i(TAG, "onDestroy");
 			mGLSurfaceView.onDestroy();
-			// Probably vain attempt to help the garbage collector...
 			mGLSurfaceView = null;
-			audioFocusChangeListener = null;
-			audioManager = null;
 		} else {
 			mSurfaceView.onDestroy();
 			mSurfaceView = null;
 		}
+
+		// Probably vain attempt to help the garbage collector...
+		audioFocusChangeListener = null;
+		audioManager = null;
+
 		sizeManager.setSurfaceView(null);
 		if (mPowerSaveModeReceiver != null) {
 			mPowerSaveModeReceiver.destroy(this);
 			mPowerSaveModeReceiver = null;
 		}
+
 		// TODO: Can we ensure that the GL thread has stopped rendering here?
 		// I've seen crashes that seem to indicate that sometimes it hasn't...
 		NativeApp.audioShutdown();
@ -697,6 +700,7 @@ public abstract class NativeActivity extends Activity {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			updateSystemUiVisibility();
 		}
+
 		// OK, config should be initialized, we can query for screen rotation.
 		if (javaGL || Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
 			updateScreenRotation("onResume");