Commit 70de38c7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix audio patch with updated vlc.git

parent 287e3cd2
...@@ -40,7 +40,7 @@ fi ...@@ -40,7 +40,7 @@ fi
export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH} export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
# 1/ libvlc, libvlccore and its plugins # 1/ libvlc, libvlccore and its plugins
TESTED_HASH=0ef62578e5b6 TESTED_HASH=2ac6942827e8
if [ ! -d "vlc" ]; then if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning" echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc git clone git://git.videolan.org/vlc.git vlc
......
From c38b628323daa70fb5430530e56df4d7d44be6bb Mon Sep 17 00:00:00 2001 From ec67d929b63cdebc2af0f415ab0a54c6a3329816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org> From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Sat, 10 Mar 2012 04:54:23 -0500 Date: Sat, 10 Mar 2012 04:54:23 -0500
Subject: [PATCH 1/3] android: threads support Subject: [PATCH 1/3] android: threads support
......
From 1e9eb93307aa878f37d4d97e1767474d752d21fe Mon Sep 17 00:00:00 2001 From 3c946805a63828f4b7d5ee4a7d99a8546c74213c Mon Sep 17 00:00:00 2001
From: Ming Hu <tewilove@gmail.com> From: Ming Hu <tewilove@gmail.com>
Date: Sun, 13 May 2012 22:20:34 +0200 Date: Sun, 13 May 2012 22:20:34 +0200
Subject: [PATCH 2/3] Android: add native AudioTrack aout module Subject: [PATCH 2/3] Android: add native AudioTrack aout module
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
--- ---
configure.ac | 12 ++ configure.ac | 12 ++
modules/audio_output/Modules.am | 1 + modules/audio_output/Modules.am | 1 +
...@@ -11,10 +12,10 @@ Subject: [PATCH 2/3] Android: add native AudioTrack aout module ...@@ -11,10 +12,10 @@ Subject: [PATCH 2/3] Android: add native AudioTrack aout module
create mode 100644 modules/audio_output/audiotrack.c create mode 100644 modules/audio_output/audiotrack.c
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 62d13ad..12c1cbe 100644 index 8765b14..1bf7692 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -3555,6 +3555,18 @@ if test "${HAVE_ANDROID}" = "1"; then @@ -3536,6 +3536,18 @@ if test "${HAVE_ANDROID}" = "1"; then
fi fi
dnl dnl
...@@ -34,7 +35,7 @@ index 62d13ad..12c1cbe 100644 ...@@ -34,7 +35,7 @@ index 62d13ad..12c1cbe 100644
dnl dnl
PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto])
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 357bc1d..c4b5a37 100644 index ea30d4d..85f2b3d 100644
--- a/modules/audio_output/Modules.am --- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am +++ b/modules/audio_output/Modules.am
@@ -5,6 +5,7 @@ SOURCES_auhal = auhal.c packet.c @@ -5,6 +5,7 @@ SOURCES_auhal = auhal.c packet.c
...@@ -47,7 +48,7 @@ index 357bc1d..c4b5a37 100644 ...@@ -47,7 +48,7 @@ index 357bc1d..c4b5a37 100644
libadummy_plugin_la_CFLAGS = $(AM_CFLAGS) libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
new file mode 100644 new file mode 100644
index 0000000..0aebbbb index 0000000..2e5cab1
--- /dev/null --- /dev/null
+++ b/modules/audio_output/audiotrack.c +++ b/modules/audio_output/audiotrack.c
@@ -0,0 +1,302 @@ @@ -0,0 +1,302 @@
...@@ -350,9 +351,9 @@ index 0000000..0aebbbb ...@@ -350,9 +351,9 @@ index 0000000..0aebbbb
+ length += p_sys->at_write(p_sys->AudioTrack, (char*)(p_buffer->p_buffer) + length, p_buffer->i_buffer - length); + length += p_sys->at_write(p_sys->AudioTrack, (char*)(p_buffer->p_buffer) + length, p_buffer->i_buffer - length);
+ } + }
+ +
+ aout_BufferFree(p_buffer); + block_Release( p_buffer );
+} +}
+ +
-- --
1.7.9.5 1.7.10.2
From 4519e40c6b16942e46b8d4da01b7f358cd21319a Mon Sep 17 00:00:00 2001 From 796397ae813096cb86e3effd9b6709e2039be8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com> From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Sun, 22 Apr 2012 09:35:52 +0200 Date: Sun, 22 Apr 2012 09:35:52 +0200
Subject: [PATCH 3/3] libvlc: add language and frame rate to Subject: [PATCH 3/3] libvlc: add language and frame rate to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment