Commits on Source (6)
-
android_utils depends on GLES2_LIBS and EGL_LIBS, but it isn't forwarded correctly from the convenience library. In particlar, it contains mostly video-related code, and some helpers for the android environment state, which is why the non-video code is using the utils library. Move the code in a separate convenience library so that it can be imported without constraints.
c65493d6 -
The convenience library libandroid_env is needed in particular for the function android_GetEnv. There's no functional changes for the current way we distribute android, ie. in static builds, since link options are ignored, but it's needed to compile a dynamic build.
ddb540cb -
Move the AudioFormat vtable to a separate file and convenience library so as to use the AudioFormat vtable from device.c. The choice of a convenience library here is to compile the code only once but be able to use it from different locations, especially since it needs the vtable filled before using the associated function. The commit doesn't change audiotrack yet, as the goal is mostly to fix the dynamic build on Android, and thus duplicates part of the code from there. Some more changes would be needed to potentially supply the vtable as parameter and provides what's missing for audiotrack.c to use this convenience library instead.
189d4353 -
Thomas Guillem authored
The encoding is previously checked in device.c
ec94c477 -
Thomas Guillem authored
Finish the transition to the new audioformat_jni helper.
352a3cd3 -
DynamicsProcessing is used by android/device.c, by audiotrack and by aaudio and a common vtable is needed as well as the matching JNI helpers to use the vtable. The vtable is currently stored in the audiotrack vtable, which is available in the other plugins in static build. But it leads to undefined reference errors when compiling a dynamic build of libvlc for android. Split the code handling this vtable in a separate convenience library to address this, which is then linked to every other targets. Since convenience libraries are playing a different role than static libraries, and are not linked but merged into the final objects that will be part of the library output (shared or archive), the symbols are then available to each of the plugins. Fixes #27726
38d17118
Showing
- modules/audio_output/Makefile.am 22 additions, 3 deletionsmodules/audio_output/Makefile.am
- modules/audio_output/android/aaudio.c 2 additions, 0 deletionsmodules/audio_output/android/aaudio.c
- modules/audio_output/android/audioformat_jni.c 175 additions, 0 deletionsmodules/audio_output/android/audioformat_jni.c
- modules/audio_output/android/audioformat_jni.h 30 additions, 0 deletionsmodules/audio_output/android/audioformat_jni.h
- modules/audio_output/android/audiotrack.c 12 additions, 102 deletionsmodules/audio_output/android/audiotrack.c
- modules/audio_output/android/device.c 6 additions, 92 deletionsmodules/audio_output/android/device.c
- modules/audio_output/android/device.h 0 additions, 27 deletionsmodules/audio_output/android/device.h
- modules/audio_output/android/dynamicsprocessing_jni.c 212 additions, 0 deletionsmodules/audio_output/android/dynamicsprocessing_jni.c
- modules/audio_output/android/dynamicsprocessing_jni.h 46 additions, 0 deletionsmodules/audio_output/android/dynamicsprocessing_jni.h
- modules/audio_output/android/opensles.c 2 additions, 1 deletionmodules/audio_output/android/opensles.c
- modules/codec/Makefile.am 2 additions, 1 deletionmodules/codec/Makefile.am
- modules/codec/omxil/mediacodec_jni.c 1 addition, 0 deletionsmodules/codec/omxil/mediacodec_jni.c
- modules/keystore/Makefile.am 1 addition, 1 deletionmodules/keystore/Makefile.am
- modules/keystore/file_crypt_android.c 1 addition, 1 deletionmodules/keystore/file_crypt_android.c
- modules/video_output/Makefile.am 13 additions, 5 deletionsmodules/video_output/Makefile.am
- modules/video_output/android/env.c 103 additions, 0 deletionsmodules/video_output/android/env.c
- modules/video_output/android/env.h 33 additions, 0 deletionsmodules/video_output/android/env.h
- modules/video_output/android/utils.c 2 additions, 78 deletionsmodules/video_output/android/utils.c
- modules/video_output/android/utils.h 0 additions, 9 deletionsmodules/video_output/android/utils.h
- modules/video_output/opengl/Makefile.am 2 additions, 1 deletionmodules/video_output/opengl/Makefile.am
modules/video_output/android/env.c
0 → 100644
modules/video_output/android/env.h
0 → 100644