Skip to content

Android native sound fix and update openal-soft to 1.21.1 #1475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 13, 2021
Merged

Android native sound fix and update openal-soft to 1.21.1 #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
28f509d
Update GLImageFormats.java
joliver82 May 17, 2018
71fcaa9
Merge remote-tracking branch 'upstream/master'
joliver82 May 23, 2018
4f8a2cc
Merge pull request #3 from jMonkeyEngine/master
joliver82 Nov 14, 2018
05db003
Merge pull request #4 from jMonkeyEngine/master
joliver82 Jun 1, 2019
18b431f
Modified JmeBatchRenderBackend to clear the inner buffer of the image…
Nov 19, 2019
38e330b
Merge pull request #5 from jMonkeyEngine/master
joliver82 Nov 20, 2019
f9282c1
First impl of testcasefor multiple atlases issue. Still missing to ad…
joliver82 Dec 19, 2019
9d8cbfa
Merge pull request #7 from jMonkeyEngine/master
joliver82 Mar 9, 2020
2a6ca82
Merge branch 'nifty-batch-fix' into master
joliver82 Mar 9, 2020
0569a0a
Merge remote-tracking branch 'upstream/master'
Jan 25, 2021
8a90e91
Manual merge pending stuff from jme3 base
Jan 25, 2021
1092b80
Manual merge
Jan 25, 2021
066ba48
Merge pull request #9 from jMonkeyEngine/master
joliver82 Feb 15, 2021
de7d5a6
Added -O0 and -O1 to fix some bad behaviour in newer NDKs making ogg …
Mar 10, 2021
fc99412
Updated openal-soft to 1.19.1
Mar 10, 2021
71afb21
Updated to latest openal-soft 1.21.1 (kcat repo)
Mar 10, 2021
c32c3bb
Removed bsinc_inc.h (not used in 1.21.1)
Mar 10, 2021
5add86b
Changed android build docker image to jme3
joliver82 Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
name: Build natives for android
runs-on: ubuntu-18.04
container:
image: riccardoblb/buildenv-jme3:android
image: jmonkeyengine/buildenv-jme3:android

steps:
- name: Clone the repo
Expand Down
9 changes: 5 additions & 4 deletions jme3-android-native/openalsoft.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// OpenAL Soft r1.16
String openALSoftUrl = 'https://github.com/jMonkeyEngine/openal-soft/archive/e5016f814a265ed592a88acea95cf912c4bfdf12.zip'
// OpenAL Soft r1.21.1
// TODO: update URL to jMonkeyEngine fork once it's updated with latest kcat's changes
String openALSoftUrl = 'https://github.com/kcat/openal-soft/archive/1.21.1.zip'
String openALSoftZipFile = 'OpenALSoft.zip'

// OpenAL Soft directory the download is extracted into
// Typically, the downloaded OpenAL Soft zip file will extract to a directory
// called "openal-soft"
String openALSoftFolder = 'openal-soft-e5016f814a265ed592a88acea95cf912c4bfdf12'
String openALSoftFolder = 'openal-soft-1.21.1'

//Working directories for the ndk build.
String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
Expand Down Expand Up @@ -56,7 +57,7 @@ task copyOpenALSoft(type: Copy) {
into outputDir
}
copyOpenALSoft.dependsOn {
def openALSoftUnzipDir = new File(project.projectDir.absolutePath + File.separator + openALSoftFolder)
def openALSoftUnzipDir = new File(openalsoftBuildDir + File.separator + openALSoftFolder)
// println "openALSoftUnzipDir path: " + openALSoftUnzipDir.absolutePath
// println "openALSoftUnzipDir exists: " + openALSoftUnzipDir.isDirectory()
if (!openALSoftUnzipDir.isDirectory()) {
Expand Down
2 changes: 1 addition & 1 deletion jme3-android-native/src/native/jme_decode/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LOCAL_C_INCLUDES:= \
$(LOCAL_PATH) \
$(LOCAL_PATH)/Tremor

LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz
LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz -O0
LOCAL_LDLIBS := -lz -llog -Wl,-s

ifeq ($(TARGET_ARCH),arm)
Expand Down
145 changes: 89 additions & 56 deletions jme3-android-native/src/native/jme_openalsoft/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGET_PLATFORM := android-9
TARGET_PLATFORM := android-19

LOCAL_PATH := $(call my-dir)

Expand All @@ -7,64 +7,97 @@ include $(CLEAR_VARS)
LOCAL_MODULE := openalsoftjme

LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/include \
$(LOCAL_PATH)/OpenAL32/Include $(LOCAL_PATH)/Alc
$(LOCAL_PATH)/alc $(LOCAL_PATH)/common

LOCAL_CFLAGS := -std=c99 -ffast-math -DAL_BUILD_LIBRARY -DAL_ALEXT_PROTOTYPES
LOCAL_CPP_FEATURES += exceptions

LOCAL_CFLAGS := -ffast-math -DAL_BUILD_LIBRARY -DAL_ALEXT_PROTOTYPES -fcommon -O0 -DRESTRICT=""
LOCAL_LDLIBS := -lOpenSLES -llog -Wl,-s

LOCAL_SRC_FILES := Alc/backends/opensl.c \
Alc/backends/loopback.c \
Alc/backends/wave.c \
Alc/backends/base.c \
Alc/backends/null.c \
Alc/ALc.c \
Alc/helpers.c \
Alc/bs2b.c \
Alc/alcRing.c \
Alc/effects/chorus.c \
Alc/effects/flanger.c \
Alc/effects/dedicated.c \
Alc/effects/reverb.c \
Alc/effects/distortion.c \
Alc/effects/autowah.c \
Alc/effects/equalizer.c \
Alc/effects/modulator.c \
Alc/effects/echo.c \
Alc/effects/compressor.c \
Alc/effects/null.c \
Alc/alcConfig.c \
Alc/ALu.c \
Alc/mixer_c.c \
Alc/panning.c \
Alc/hrtf.c \
Alc/mixer.c \
Alc/midi/soft.c \
Alc/midi/sf2load.c \
Alc/midi/dummy.c \
Alc/midi/fluidsynth.c \
Alc/midi/base.c \
common/uintmap.c \
common/atomic.c \
common/threads.c \
common/rwlock.c \
OpenAL32/alBuffer.c \
OpenAL32/alPreset.c \
OpenAL32/alListener.c \
OpenAL32/alEffect.c \
OpenAL32/alExtension.c \
OpenAL32/alThunk.c \
OpenAL32/alMidi.c \
OpenAL32/alSoundfont.c \
OpenAL32/alFontsound.c \
OpenAL32/alAuxEffectSlot.c \
OpenAL32/alError.c \
OpenAL32/alFilter.c \
OpenAL32/alSource.c \
OpenAL32/alState.c \
OpenAL32/sample_cvt.c \
com_jme3_audio_android_AndroidAL.c \
com_jme3_audio_android_AndroidALC.c \
com_jme3_audio_android_AndroidEFX.c
LOCAL_SRC_FILES := al/auxeffectslot.cpp \
al/buffer.cpp \
al/effect.cpp \
al/effects/autowah.cpp \
al/effects/chorus.cpp \
al/effects/compressor.cpp \
al/effects/convolution.cpp \
al/effects/dedicated.cpp \
al/effects/distortion.cpp \
al/effects/echo.cpp \
al/effects/equalizer.cpp \
al/effects/fshifter.cpp \
al/effects/modulator.cpp \
al/effects/null.cpp \
al/effects/pshifter.cpp \
al/effects/reverb.cpp \
al/effects/vmorpher.cpp \
al/error.cpp \
al/event.cpp \
al/extension.cpp \
al/filter.cpp \
al/listener.cpp \
al/source.cpp \
al/state.cpp \
alc/alc.cpp \
alc/alconfig.cpp \
alc/alu.cpp \
alc/backends/base.cpp \
alc/backends/loopback.cpp \
alc/backends/null.cpp \
alc/backends/opensl.cpp \
alc/backends/wave.cpp \
alc/bformatdec.cpp \
alc/buffer_storage.cpp \
alc/converter.cpp \
alc/effects/autowah.cpp \
alc/effects/chorus.cpp \
alc/effects/compressor.cpp \
alc/effects/convolution.cpp \
alc/effects/dedicated.cpp \
alc/effects/distortion.cpp \
alc/effects/echo.cpp \
alc/effects/equalizer.cpp \
alc/effects/fshifter.cpp \
alc/effects/modulator.cpp \
alc/effects/null.cpp \
alc/effects/pshifter.cpp \
alc/effects/reverb.cpp \
alc/effects/vmorpher.cpp \
alc/effectslot.cpp \
alc/helpers.cpp \
alc/hrtf.cpp \
alc/panning.cpp \
alc/uiddefs.cpp \
alc/voice.cpp \
common/alcomplex.cpp \
common/alfstream.cpp \
common/almalloc.cpp \
common/alstring.cpp \
common/dynload.cpp \
common/polyphase_resampler.cpp \
common/ringbuffer.cpp \
common/strutils.cpp \
common/threads.cpp \
core/ambdec.cpp \
core/bs2b.cpp \
core/bsinc_tables.cpp \
core/cpu_caps.cpp \
core/devformat.cpp \
core/except.cpp \
core/filters/biquad.cpp \
core/filters/nfc.cpp \
core/filters/splitter.cpp \
core/fmt_traits.cpp \
core/fpu_ctrl.cpp \
core/logging.cpp \
core/mastering.cpp \
core/mixer/mixer_c.cpp \
core/uhjfilter.cpp \
com_jme3_audio_android_AndroidAL.c \
com_jme3_audio_android_AndroidALC.c \
com_jme3_audio_android_AndroidEFX.c

include $(BUILD_SHARED_LIBRARY)

# Alc/mixer/hrtf_inc.c \

6 changes: 4 additions & 2 deletions jme3-android-native/src/native/jme_openalsoft/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
APP_PLATFORM := android-9
APP_PLATFORM := android-19
APP_OPTIM := release
APP_ABI := all
APP_ABI := all
APP_STL := c++_static

Loading