diff --git a/extras/package/android/Makefile b/extras/package/android/Makefile
index 2060bab..42bf280 100644
--- a/extras/package/android/Makefile
+++ b/extras/package/android/Makefile
@@ -54,12 +54,11 @@ $(APK_MK):
printf "LOCAL_SRC_FILES := libvlcjni.c aout.c thumbnailer.c\n" >> $(APK_MK); \
printf "LOCAL_C_INCLUDES := \$$(LOCAL_PATH)/../../../../../include\n" >> $(APK_MK); \
printf "LOCAL_LDLIBS := -L$$vlc_contrib/lib \\\\\n" >> $(APK_MK); \
- printf "\t-L$$ANDROID_NDK/platforms/android-8/arch-arm/usr/lib \\\\\n" >> $(APK_MK); \
printf "$$LDFLAGS" >> $(APK_MK); \
printf "\t$$prefix$$VLC_BUILD_DIR/compat/.libs/libcompat.a \\\\\n" >> $(APK_MK); \
printf "\t$$prefix$$VLC_BUILD_DIR/src/.libs/libvlc.a \\\\\n" >> $(APK_MK); \
printf "\t$$prefix$$VLC_BUILD_DIR/src/.libs/libvlccore.a \\\\\n" >> $(APK_MK); \
- printf "\t-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lpixman-1\n" >> $(APK_MK); \
+ printf "\t-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lpixman-1 -lOpenSLES\n" >> $(APK_MK); \
printf "include \$$(BUILD_SHARED_LIBRARY)\n" >> $(APK_MK)
$(LIBVLCJNI): $(JNI_SOURCES) $(APK_MK)
diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh
index 90116b8..6cff898 100755
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -5,7 +5,7 @@ if [ -z "$ANDROID_NDK" ]; then
exit 1
fi
-ANDROID_API=android-8
+ANDROID_API=android-9
ANDROID_BIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/
ANDROID_INCLUDE=$ANDROID_NDK/platforms/$ANDROID_API/arch-arm/usr/include
@@ -44,6 +44,7 @@ sh ../configure --host=arm-eabi-linux --build=x86_64-unknown-linux \
--enable-avcodec \
--enable-avformat \
--enable-android-vout \
+ --enable-opensles \
--disable-vlc \
--enable-live555 --enable-realrtsp \
--disable-xcb --disable-dbus --disable-vcd --disable-v4l2 --disable-atmo --disable-qt4 --disable-skins2 --disable-mad --disable-mkv --disable-live555 --disable-libgcrypt --disable-lua --disable-mtp --disable-dvdread --disable-alsa --disable-sdl --disable-sdl-image --disable-taglib --disable-notify --disable-freetype --disable-sqlite --disable-udev --disable-caca --disable-glx --disable-egl --disable-gl --disable-libxml2 --disable-svg
diff --git a/extras/package/android/vlc-android/AndroidManifest.xml b/extras/package/android/vlc-android/AndroidManifest.xml
index 9b21413..3fa757a 100644
--- a/extras/package/android/vlc-android/AndroidManifest.xml
+++ b/extras/package/android/vlc-android/AndroidManifest.xml
@@ -5,8 +5,8 @@
android:versionName="1.0">
+ android:minSdkVersion="9"
+ android:targetSdkVersion="10" />
diff --git a/extras/package/android/vlc-android/default.properties b/extras/package/android/vlc-android/default.properties
index 0b9250e..8010039 100644
--- a/extras/package/android/vlc-android/default.properties
+++ b/extras/package/android/vlc-android/default.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-8
+target=android-10
diff --git a/extras/package/android/vlc-android/jni/Application.mk b/extras/package/android/vlc-android/jni/Application.mk
index 631ba54..682f11b 100644
--- a/extras/package/android/vlc-android/jni/Application.mk
+++ b/extras/package/android/vlc-android/jni/Application.mk
@@ -1 +1 @@
-APP_PLATFORM := android-8
+APP_PLATFORM := android-10
diff --git a/extras/package/android/vlc-android/jni/aout.c b/extras/package/android/vlc-android/jni/aout.c
index 3c4050a..93542a0 100644
--- a/extras/package/android/vlc-android/jni/aout.c
+++ b/extras/package/android/vlc-android/jni/aout.c
@@ -3,6 +3,9 @@
#include
+#include
+
+#if __ANDROID_API__ < 9
#include "aout.h"
#define LOG_TAG "VLC/JNI/aout"
@@ -161,4 +164,4 @@ void aout_close(void *opaque)
(*myVm)->DetachCurrentThread (myVm);
free (p_sys);
}
-
+#endif
diff --git a/extras/package/android/vlc-android/src/vlc/android/Aout.java b/extras/package/android/vlc-android/src/vlc/android/Aout.java
index 94a3732..a80c584 100644
--- a/extras/package/android/vlc-android/src/vlc/android/Aout.java
+++ b/extras/package/android/vlc-android/src/vlc/android/Aout.java
@@ -21,27 +21,27 @@ public class Aout {
private static final String TAG = "LibVLC/aout";
public void init(int sampleRateInHz, int channels, int samples) {
- Log.d(TAG, sampleRateInHz + ", " + channels + ", " + samples + "=>" + channels*samples);
+ /*Log.d(TAG, sampleRateInHz + ", " + channels + ", " + samples + "=>" + channels*samples);
mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC,
sampleRateInHz,
AudioFormat.CHANNEL_CONFIGURATION_STEREO,
AudioFormat.ENCODING_PCM_16BIT,
channels * samples * 2,
- AudioTrack.MODE_STREAM);
+ AudioTrack.MODE_STREAM);*/
}
public void release() {
- Log.d(TAG, "Stopping audio playback");
+ /*Log.d(TAG, "Stopping audio playback");
// mAudioTrack.stop();
mAudioTrack.release();
- mAudioTrack = null;
+ mAudioTrack = null;*/
}
public void playBuffer(byte[] audioData, int bufferSize, int nbSamples) {
- if (mAudioTrack.write(audioData, 0, bufferSize) != bufferSize)
+ /*if (mAudioTrack.write(audioData, 0, bufferSize) != bufferSize)
{
Log.w(TAG, "Could not write all the samples to the audio device");
}
- mAudioTrack.play();
+ mAudioTrack.play();*/
}
}
diff --git a/extras/package/android/vlc-android/src/vlc/android/LibVLC.java b/extras/package/android/vlc-android/src/vlc/android/LibVLC.java
index 6472c96..2717f61 100644
--- a/extras/package/android/vlc-android/src/vlc/android/LibVLC.java
+++ b/extras/package/android/vlc-android/src/vlc/android/LibVLC.java
@@ -12,7 +12,7 @@ public class LibVLC {
private int mLibVlcInstance = 0; // Read-only, reserved for JNI
private int mMediaPlayerInstance = 0; // Read-only, reserved for JNI
- private Aout mAout;
+ // private Aout mAout;
public native void attachSurface(Surface surface, int width, int height);
public native void detachSurface();
@@ -49,7 +49,7 @@ public class LibVLC {
* It is private because this class is a singleton.
*/
private LibVLC() {
- mAout = new Aout();
+ // mAout = new Aout();
}
/**
@@ -97,7 +97,7 @@ public class LibVLC {
public void initAout(int sampleRateInHz, int channels, int samples)
{
Log.d(TAG, "Opening the java audio output");
- mAout.init(sampleRateInHz, channels, samples);
+ // mAout.init(sampleRateInHz, channels, samples);
}
/**
@@ -106,7 +106,7 @@ public class LibVLC {
*/
public void playAudio(byte[] audioData, int bufferSize, int nbSamples)
{
- mAout.playBuffer(audioData, bufferSize, nbSamples);
+ // mAout.playBuffer(audioData, bufferSize, nbSamples);
}
/**
@@ -116,7 +116,7 @@ public class LibVLC {
public void closeAout()
{
Log.d(TAG, "Closing the java audio output");
- mAout.release();
+ // mAout.release();
}
/**
diff --git a/extras/package/android/vlc-android/src/vlc/android/ThumbnailerManager.java b/extras/package/android/vlc-android/src/vlc/android/ThumbnailerManager.java
index 7408533..ee335a9 100644
--- a/extras/package/android/vlc-android/src/vlc/android/ThumbnailerManager.java
+++ b/extras/package/android/vlc-android/src/vlc/android/ThumbnailerManager.java
@@ -54,7 +54,7 @@ public class ThumbnailerManager extends Thread {
*/
public void run()
{
- while (!isInterrupted()) {
+ /*while (!isInterrupted()) {
lock.lock();
// Get the id of the file browser item to create its thumbnail.
boolean killed = false;
@@ -98,6 +98,6 @@ public class ThumbnailerManager extends Thread {
} catch (BrokenBarrierException e) {
break;
}
- }
+ } */
}
}
diff --git a/modules/audio_output/opensles.c b/modules/audio_output/opensles.c
index 99873a1..91e7f43 100644
--- a/modules/audio_output/opensles.c
+++ b/modules/audio_output/opensles.c
@@ -182,7 +182,7 @@ static int Open( vlc_object_t * p_this )
SLDataFormat_PCM format_pcm;
format_pcm.formatType = SL_DATAFORMAT_PCM;
format_pcm.numChannels = 2;
- format_pcm.samplesPerSec = SL_SAMPLINGRATE_44_1;
+ format_pcm.samplesPerSec = ((SLuint32) p_aout->output.output.i_rate * 1000) ;
format_pcm.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
format_pcm.containerSize = SL_PCMSAMPLEFORMAT_FIXED_16;
format_pcm.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
@@ -259,8 +259,8 @@ static int Open( vlc_object_t * p_this )
// we want 16bit signed data little endian.
p_aout->output.output.i_format = VLC_CODEC_S16L;
- p_aout->output.i_nb_samples = 512;
- p_aout->output.output.i_rate = 44000;
+ p_aout->output.i_nb_samples = 2048;
+ // p_aout->output.output.i_rate = 44100;
p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
aout_FormatPrepare( &p_aout->output.output );