projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated SDL Java files for Android platform
[rocksndiamonds.git]
/
build-projects
/
android
/
app
/
src
/
main
/
java
/
org
/
libsdl
/
app
/
SDLAudioManager.java
diff --git
a/build-projects/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
b/build-projects/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
index 0714419c2925a4a08e8ce406a414bc3ead78868c..2bfc71860900556ce0ac1481e7162d2d216cb706 100644
(file)
--- a/
build-projects/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
+++ b/
build-projects/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
@@
-1,6
+1,10
@@
package org.libsdl.app;
package org.libsdl.app;
-import android.media.*;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaRecorder;
import android.os.Build;
import android.util.Log;
import android.os.Build;
import android.util.Log;
@@
-43,6
+47,10
@@
public class SDLAudioManager
if (desiredChannels > 2) {
desiredChannels = 2;
}
if (desiredChannels > 2) {
desiredChannels = 2;
}
+ }
+
+ /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
+ if (Build.VERSION.SDK_INT < 22) {
if (sampleRate < 8000) {
sampleRate = 8000;
} else if (sampleRate > 48000) {
if (sampleRate < 8000) {
sampleRate = 8000;
} else if (sampleRate > 48000) {
@@
-199,7
+207,6
@@
public class SDLAudioManager
results[0] = mAudioRecord.getSampleRate();
results[1] = mAudioRecord.getAudioFormat();
results[2] = mAudioRecord.getChannelCount();
results[0] = mAudioRecord.getSampleRate();
results[1] = mAudioRecord.getAudioFormat();
results[2] = mAudioRecord.getChannelCount();
- results[3] = desiredFrames;
} else {
if (mAudioTrack == null) {
} else {
if (mAudioTrack == null) {
@@
-223,8
+230,8
@@
public class SDLAudioManager
results[0] = mAudioTrack.getSampleRate();
results[1] = mAudioTrack.getAudioFormat();
results[2] = mAudioTrack.getChannelCount();
results[0] = mAudioTrack.getSampleRate();
results[1] = mAudioTrack.getAudioFormat();
results[2] = mAudioTrack.getChannelCount();
- results[3] = desiredFrames;
}
}
+ results[3] = desiredFrames;
Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", got " + results[3] + " frames of " + results[2] + " channel " + getAudioFormatString(results[1]) + " audio at " + results[0] + " Hz");
Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", got " + results[3] + " frames of " + results[2] + " channel " + getAudioFormatString(results[1]) + " audio at " + results[0] + " Hz");