Permalink
Browse files

Merge pull request #546 from mupen64plus-ae/threaded_sles

[WIP] Threaded SLES audio with time stretching
  • Loading branch information...
2 parents 0f01f7e + 64b8cd0 commit 81970a9a7fde689cc85fd98e2e1159e7d23d2bbb @fzurita fzurita committed Mar 14, 2016
Showing with 20,561 additions and 528 deletions.
  1. +2 −0 jni/Android.mk
  2. +2,774 −0 jni/SLES/include/SLES/OpenSLES.h
  3. +373 −0 jni/SLES/include/SLES/OpenSLES_Android.h
  4. +73 −0 jni/SLES/include/SLES/OpenSLES_AndroidConfiguration.h
  5. +47 −0 jni/SLES/include/SLES/OpenSLES_AndroidMetadata.h
  6. +57 −0 jni/SLES/include/SLES/OpenSLES_Platform.h
  7. BIN jni/SLES/lib/arm/libOpenSLES.so
  8. BIN jni/SLES/lib/x86/libOpenSLES.so
  9. +32 −11 jni/mupen64plus-audio-sles/Android.mk
  10. +518 −341 jni/mupen64plus-audio-sles/{main.c → main.cpp}
  11. 0 jni/mupen64plus-audio-sles/{osal_dynamiclib_unix.c → osal_dynamiclib_unix.cpp}
  12. +206 −0 jni/mupen64plus-audio-sles/threadqueue.cpp
  13. +190 −0 jni/mupen64plus-audio-sles/threadqueue.h
  14. +40 −22 jni/mupen64plus-core/src/main/main.c
  15. +1 −1 jni/mupen64plus-video-gliden64.mk
  16. +1 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxDbg.cpp
  17. +1 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/txWidestringWrapper.cpp
  18. +458 −0 jni/soundtouch/COPYING.TXT
  19. +69 −0 jni/soundtouch/Makefile.am
  20. +874 −0 jni/soundtouch/README.html
  21. +26 −0 jni/soundtouch/bootstrap
  22. +3 −0 jni/soundtouch/config/README.TXT
  23. +28 −0 jni/soundtouch/config/am_include.mk
  24. +3 −0 jni/soundtouch/configure-file-README.txt
  25. +265 −0 jni/soundtouch/configure.ac
  26. +164 −0 jni/soundtouch/include/BPMDetect.h
  27. +184 −0 jni/soundtouch/include/FIFOSampleBuffer.h
  28. +234 −0 jni/soundtouch/include/FIFOSamplePipe.h
  29. +26 −0 jni/soundtouch/include/Makefile.am
  30. +185 −0 jni/soundtouch/include/STTypes.h
  31. +301 −0 jni/soundtouch/include/SoundTouch.h
  32. +5 −0 jni/soundtouch/include/soundtouch_config.h.in
  33. +63 −0 jni/soundtouch/make-win.bat
  34. +14 −0 jni/soundtouch/soundtouch-1.4.pc.in
  35. +70 −0 jni/soundtouch/soundtouch.m4
  36. +11 −0 jni/soundtouch/soundtouch.pc.in
  37. +30 −0 jni/soundtouch/source/Android-lib/AndroidManifest.xml
  38. +122 −0 jni/soundtouch/source/Android-lib/README-SoundTouch-Android.html
  39. +57 −0 jni/soundtouch/source/Android-lib/jni/Android.mk
  40. +10 −0 jni/soundtouch/source/Android-lib/jni/Application.mk
  41. +3 −0 jni/soundtouch/source/Android-lib/lint.xml
  42. +20 −0 jni/soundtouch/source/Android-lib/proguard-project.txt
  43. +14 −0 jni/soundtouch/source/Android-lib/project.properties
  44. BIN jni/soundtouch/source/Android-lib/res/drawable-hdpi/ic_launcher.png
  45. BIN jni/soundtouch/source/Android-lib/res/drawable-mdpi/ic_launcher.png
  46. BIN jni/soundtouch/source/Android-lib/res/drawable-xhdpi/ic_launcher.png
  47. BIN jni/soundtouch/source/Android-lib/res/drawable-xxhdpi/ic_launcher.png
  48. +140 −0 jni/soundtouch/source/Android-lib/res/layout/activity_example.xml
  49. +7 −0 jni/soundtouch/source/Android-lib/res/values/strings.xml
  50. +20 −0 jni/soundtouch/source/Android-lib/res/values/styles.xml
  51. +224 −0 jni/soundtouch/source/Android-lib/src/net/surina/ExampleActivity.java
  52. +83 −0 jni/soundtouch/source/Android-lib/src/net/surina/soundtouch/SoundTouch.java
  53. +28 −0 jni/soundtouch/source/Makefile.am
  54. +54 −0 jni/soundtouch/source/SoundStretch/Makefile.am
  55. +301 −0 jni/soundtouch/source/SoundStretch/RunParameters.cpp
  56. +72 −0 jni/soundtouch/source/SoundStretch/RunParameters.h
  57. +997 −0 jni/soundtouch/source/SoundStretch/WavFile.cpp
  58. +285 −0 jni/soundtouch/source/SoundStretch/WavFile.h
  59. +333 −0 jni/soundtouch/source/SoundStretch/main.cpp
  60. +137 −0 jni/soundtouch/source/SoundStretch/soundstretch.dsp
  61. +44 −0 jni/soundtouch/source/SoundStretch/soundstretch.dsw
  62. +33 −0 jni/soundtouch/source/SoundStretch/soundstretch.sln
  63. +740 −0 jni/soundtouch/source/SoundStretch/soundstretch.vcproj
  64. +236 −0 jni/soundtouch/source/SoundTouch/AAFilter.cpp
  65. +100 −0 jni/soundtouch/source/SoundTouch/AAFilter.h
  66. +371 −0 jni/soundtouch/source/SoundTouch/BPMDetect.cpp
  67. +274 −0 jni/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
  68. +328 −0 jni/soundtouch/source/SoundTouch/FIRFilter.cpp
  69. +146 −0 jni/soundtouch/source/SoundTouch/FIRFilter.h
  70. +200 −0 jni/soundtouch/source/SoundTouch/InterpolateCubic.cpp
  71. +67 −0 jni/soundtouch/source/SoundTouch/InterpolateCubic.h
  72. +300 −0 jni/soundtouch/source/SoundTouch/InterpolateLinear.cpp
  73. +92 −0 jni/soundtouch/source/SoundTouch/InterpolateLinear.h
  74. +185 −0 jni/soundtouch/source/SoundTouch/InterpolateShannon.cpp
  75. +72 −0 jni/soundtouch/source/SoundTouch/InterpolateShannon.h
  76. +75 −0 jni/soundtouch/source/SoundTouch/Makefile.am
  77. +286 −0 jni/soundtouch/source/SoundTouch/PeakFinder.cpp
  78. +97 −0 jni/soundtouch/source/SoundTouch/PeakFinder.h
  79. +302 −0 jni/soundtouch/source/SoundTouch/RateTransposer.cpp
  80. +179 −0 jni/soundtouch/source/SoundTouch/RateTransposer.h
  81. +526 −0 jni/soundtouch/source/SoundTouch/SoundTouch.cpp
  82. +188 −0 jni/soundtouch/source/SoundTouch/SoundTouch.dsp
  83. +31 −0 jni/soundtouch/source/SoundTouch/SoundTouch.dsw
  84. +27 −0 jni/soundtouch/source/SoundTouch/SoundTouch.sln
  85. +940 −0 jni/soundtouch/source/SoundTouch/SoundTouch.vcproj
  86. +1,078 −0 jni/soundtouch/source/SoundTouch/TDStretch.cpp
  87. +281 −0 jni/soundtouch/source/SoundTouch/TDStretch.h
  88. +62 −0 jni/soundtouch/source/SoundTouch/cpu_detect.h
  89. +138 −0 jni/soundtouch/source/SoundTouch/cpu_detect_x86.cpp
  90. +395 −0 jni/soundtouch/source/SoundTouch/mmx_optimized.cpp
  91. +372 −0 jni/soundtouch/source/SoundTouch/sse_optimized.cpp
  92. +334 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp
  93. +172 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.h
  94. +471 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.pas
  95. +114 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.rc
  96. +33 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.sln
  97. +537 −0 jni/soundtouch/source/SoundTouchDLL/SoundTouchDLL.vcproj
  98. +15 −0 jni/soundtouch/source/SoundTouchDLL/resource.h
  99. +20 −16 res/values/arrays.xml
  100. +7 −4 res/values/strings.xml
  101. +17 −6 res/xml/preferences_audio.xml
  102. +288 −0 res/xml/preferences_global.xml
  103. +4 −1 src/paulscode/android/mupen64plusae/SplashActivity.java
  104. +84 −81 src/paulscode/android/mupen64plusae/game/GameSurface.java
  105. +15 −1 src/paulscode/android/mupen64plusae/jni/NativeConfigFiles.java
  106. +3 −1 src/paulscode/android/mupen64plusae/persistent/AudioPrefsActivity.java
  107. +6 −2 src/paulscode/android/mupen64plusae/persistent/GlobalPrefs.java
  108. +41 −41 src/paulscode/android/mupen64plusae/preference/SeekBarPreference.java
View
@@ -6,6 +6,7 @@ SDL_INCLUDES := $(JNI_LOCAL_PATH)/SDL2/include/
PNG_INCLUDES := $(JNI_LOCAL_PATH)/png/include/
SAMPLERATE_INCLUDES := $(JNI_LOCAL_PATH)/libsamplerate/
FREETYPE_INCLUDES := $(JNI_LOCAL_PATH)/freetype/include/
+SOUNDTOUCH_INCLUDES := $(JNI_LOCAL_PATH)/soundtouch/include/
COMMON_CFLAGS := \
-O3 \
@@ -20,6 +21,7 @@ COMMON_CPPFLAGS := \
-fvisibility-inlines-hidden \
include $(JNI_LOCAL_PATH)/SDL2/Android.mk
+include $(JNI_LOCAL_PATH)/soundtouch/source/Android-lib/jni/Android.mk
include $(JNI_LOCAL_PATH)/png/Android.mk
include $(JNI_LOCAL_PATH)/freetype.mk
include $(JNI_LOCAL_PATH)/libsamplerate/Android.mk
Oops, something went wrong.

0 comments on commit 81970a9

Please sign in to comment.