[Android] Temporarily uncrash the build in AudioTrack

Edward Wang git at videolan.org
Tue Dec 4 21:44:21 CET 2012


vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Tue Dec  4 15:39:45 2012 -0500| [e55898a0b3977232a4dfc14ccfd3b82b9ec93dc1] | committer: Edward Wang

Temporarily uncrash the build in AudioTrack

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e55898a0b3977232a4dfc14ccfd3b82b9ec93dc1
---

 compile.sh                                    |    2 +-
 patches/0003-Audiotrack-Implement-Flush.patch |   47 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index 594eabf..ce13c87 100755
--- a/compile.sh
+++ b/compile.sh
@@ -83,7 +83,7 @@ NDK_TOOLCHAIN_PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`un
 export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=9aef14d5e5
+TESTED_HASH=4f42f23
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0003-Audiotrack-Implement-Flush.patch b/patches/0003-Audiotrack-Implement-Flush.patch
new file mode 100644
index 0000000..c6291ca
--- /dev/null
+++ b/patches/0003-Audiotrack-Implement-Flush.patch
@@ -0,0 +1,47 @@
+From a6ea4dec42c3b0735239899bb7d6522c65e41c93 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz at gmail.com>
+Date: Tue, 4 Dec 2012 19:27:50 +0100
+Subject: [PATCH 3/3] Audiotrack: Implement Flush
+
+---
+ modules/audio_output/audiotrack.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
+index bea55ff..9247aa4 100644
+--- a/modules/audio_output/audiotrack.c
++++ b/modules/audio_output/audiotrack.c
+@@ -122,6 +122,7 @@ static int  Open(vlc_object_t *);
+ static void Close(vlc_object_t *);
+ static void Play(audio_output_t*, block_t*);
+ static void Pause (audio_output_t *, bool, mtime_t);
++static void Flush (audio_output_t *, bool);
+ 
+ vlc_module_begin ()
+     set_shortname("AudioTrack")
+@@ -277,6 +278,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
+     aout->time_get = NULL;
+     aout->play = Play;
+     aout->pause = Pause;
++    aout->flush = Flush;
+ 
+     p_sys->at_start(p_sys->AudioTrack);
+ 
+@@ -321,6 +323,14 @@ static void Pause(audio_output_t *p_aout, bool pause, mtime_t date)
+     }
+ }
+ 
++static void Flush (audio_output_t *p_aout, bool wait)
++{
++    VLC_UNUSED(wait); /* FIXME implement drain */
++    aout_sys_t *p_sys = p_aout->sys;
++
++    p_sys->at_flush(p_sys->AudioTrack);
++}
++
+ static int Open(vlc_object_t *obj)
+ {
+     audio_output_t *aout = (audio_output_t *)obj;
+-- 
+1.7.5.4
+



More information about the Android mailing list