diff --git a/patches/0001-android-threads-support.patch b/patches/0001-android-threads-support.patch index acae10c20f3b8304fd12121ccfdc24f411e081c6..de3cb03ae8c32b9ffabe14bdd6ab071c7bcdfba3 100644 --- a/patches/0001-android-threads-support.patch +++ b/patches/0001-android-threads-support.patch @@ -1,7 +1,7 @@ -From cd7c00d436350273366720bb3a4d99c1799a4d92 Mon Sep 17 00:00:00 2001 +From 1c54a378849090489b1c83159217f24375e66627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sat, 10 Mar 2012 04:54:23 -0500 -Subject: [PATCH] android: threads support +Subject: [PATCH 1/6] android: threads support emulate pthread_cancel (based on win32 code) TODO: @@ -30,14 +30,14 @@ TODO: timer, rwlocks, mutexes, clock, threadvar are 100% shared with linux so it'd be useless to have 2 copies. --- - include/vlc_threads.h | 13 +++ - lib/error.c | 10 ++ - src/Makefile.am | 17 ++++ - src/posix/thread.c | 244 +++++++++++++++++++++++++++++++++++++++++++------ - 4 files changed, 256 insertions(+), 28 deletions(-) + include/vlc_threads.h | 13 +++ + lib/error.c | 10 +++ + src/Makefile.am | 17 ++++ + src/posix/thread.c | 239 ++++++++++++++++++++++++++++++++++++++++++++------ + 4 files changed, 253 insertions(+), 26 deletions(-) diff --git a/include/vlc_threads.h b/include/vlc_threads.h -index 4dd6335..01a8101 100644 +index cc0e8b1..77ab8a5 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -42,6 +42,15 @@ @@ -102,7 +102,7 @@ index d053faa..52840e8 100644 vlc_mutex_unlock (&lock); } diff --git a/src/Makefile.am b/src/Makefile.am -index 8f9a237..a267412 100644 +index 9ac25d3..bdf1fb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -205,6 +205,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc @@ -151,7 +151,7 @@ index 8f9a237..a267412 100644 posix/dirs.c \ posix/filesystem.c \ diff --git a/src/posix/thread.c b/src/posix/thread.c -index 1fc2b67..4bdc7b5 100644 +index c414def..ab2a3af 100644 --- a/src/posix/thread.c +++ b/src/posix/thread.c @@ -1,5 +1,5 @@ @@ -188,7 +188,7 @@ index 1fc2b67..4bdc7b5 100644 #if (_POSIX_TIMERS > 0) static unsigned vlc_clock_prec; -@@ -162,7 +176,7 @@ vlc_thread_fatal (const char *action, int error, +@@ -162,7 +175,7 @@ vlc_thread_fatal (const char *action, int error, const char *function, const char *file, unsigned line) { int canc = vlc_savecancel (); @@ -197,7 +197,7 @@ index 1fc2b67..4bdc7b5 100644 action, error, vlc_threadid ()); vlc_trace (function, file, line); -@@ -332,6 +346,57 @@ void vlc_mutex_unlock (vlc_mutex_t *p_mutex) +@@ -318,6 +331,57 @@ void vlc_mutex_unlock (vlc_mutex_t *p_mutex) VLC_THREAD_ASSERT ("unlocking mutex"); } @@ -255,7 +255,7 @@ index 1fc2b67..4bdc7b5 100644 /** * Initializes a condition variable. */ -@@ -425,7 +490,22 @@ void vlc_cond_broadcast (vlc_cond_t *p_condvar) +@@ -411,7 +475,22 @@ void vlc_cond_broadcast (vlc_cond_t *p_condvar) */ void vlc_cond_wait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex) { @@ -278,7 +278,7 @@ index 1fc2b67..4bdc7b5 100644 VLC_THREAD_ASSERT ("waiting on condition"); } -@@ -447,10 +527,25 @@ void vlc_cond_wait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex) +@@ -433,10 +512,25 @@ void vlc_cond_wait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex) int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex, mtime_t deadline) { @@ -304,7 +304,7 @@ index 1fc2b67..4bdc7b5 100644 return val; } -@@ -529,10 +624,14 @@ void vlc_sem_wait (vlc_sem_t *sem) +@@ -515,10 +609,14 @@ void vlc_sem_wait (vlc_sem_t *sem) val = EINVAL; #else @@ -322,7 +322,7 @@ index 1fc2b67..4bdc7b5 100644 #endif VLC_THREAD_ASSERT ("locking semaphore"); -@@ -719,7 +818,22 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr, +@@ -705,7 +803,22 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr, assert (ret == 0); /* fails iif VLC_STACKSIZE is invalid */ #endif @@ -346,7 +346,7 @@ index 1fc2b67..4bdc7b5 100644 pthread_sigmask (SIG_SETMASK, &oldset, NULL); pthread_attr_destroy (attr); return ret; -@@ -760,8 +874,14 @@ int vlc_clone (vlc_thread_t *th, void *(*entry) (void *), void *data, +@@ -746,8 +859,14 @@ int vlc_clone (vlc_thread_t *th, void *(*entry) (void *), void *data, */ void vlc_join (vlc_thread_t handle, void **result) { @@ -362,7 +362,7 @@ index 1fc2b67..4bdc7b5 100644 } /** -@@ -841,10 +961,25 @@ int vlc_set_priority (vlc_thread_t th, int priority) +@@ -827,10 +946,25 @@ int vlc_set_priority (vlc_thread_t th, int priority) */ void vlc_cancel (vlc_thread_t thread_id) { @@ -392,7 +392,7 @@ index 1fc2b67..4bdc7b5 100644 } /** -@@ -857,11 +992,13 @@ void vlc_cancel (vlc_thread_t thread_id) +@@ -843,11 +977,13 @@ void vlc_cancel (vlc_thread_t thread_id) */ int vlc_savecancel (void) { @@ -410,7 +410,7 @@ index 1fc2b67..4bdc7b5 100644 } /** -@@ -871,18 +1008,19 @@ int vlc_savecancel (void) +@@ -857,18 +993,19 @@ int vlc_savecancel (void) */ void vlc_restorecancel (int state) { @@ -436,7 +436,7 @@ index 1fc2b67..4bdc7b5 100644 #endif } -@@ -895,13 +1033,48 @@ void vlc_restorecancel (int state) +@@ -881,13 +1018,48 @@ void vlc_restorecancel (int state) */ void vlc_testcancel (void) { @@ -488,7 +488,7 @@ index 1fc2b67..4bdc7b5 100644 } /** -@@ -978,8 +1151,23 @@ void msleep (mtime_t delay) +@@ -964,8 +1136,23 @@ void msleep (mtime_t delay) while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR); #else @@ -515,5 +515,5 @@ index 1fc2b67..4bdc7b5 100644 #endif } -- -1.7.5.4 +1.7.12.1 diff --git a/patches/0002-Android-add-native-AudioTrack-aout-module.patch b/patches/0002-Android-add-native-AudioTrack-aout-module.patch index 99318d315f5667a57db65b1158cd78727d649a86..6353ec262751cdd89b627de7e8177975aeb37143 100644 --- a/patches/0002-Android-add-native-AudioTrack-aout-module.patch +++ b/patches/0002-Android-add-native-AudioTrack-aout-module.patch @@ -1,21 +1,21 @@ -From 0686a550cbb87e33b6162158f61e7d9de80e50b5 Mon Sep 17 00:00:00 2001 +From 8b6fad6b9a4f77c3ffaa69dde98358c7b7c5d73d Mon Sep 17 00:00:00 2001 From: Ming Hu Date: Sun, 13 May 2012 22:20:34 +0200 -Subject: [PATCH 2/5] Android: add native AudioTrack aout module +Subject: [PATCH 2/6] Android: add native AudioTrack aout module Signed-off-by: Jean-Baptiste Kempf --- - configure.ac | 12 ++ - modules/audio_output/Modules.am | 1 + - modules/audio_output/audiotrack.c | 331 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 344 insertions(+), 0 deletions(-) + configure.ac | 12 ++ + modules/audio_output/Modules.am | 1 + + modules/audio_output/audiotrack.c | 331 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 344 insertions(+) create mode 100644 modules/audio_output/audiotrack.c diff --git a/configure.ac b/configure.ac -index 8fbcd81..131fc0e 100644 +index 3b9cb77..10b0579 100644 --- a/configure.ac +++ b/configure.ac -@@ -3548,6 +3548,18 @@ if test "${HAVE_ANDROID}" = "1"; then +@@ -3446,6 +3446,18 @@ if test "${HAVE_ANDROID}" = "1"; then fi dnl @@ -384,5 +384,5 @@ index 0000000..8ad32c3 + } +} -- -1.7.5.4 +1.7.12.1 diff --git a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch index 7fa5ba84c38ac14df529de61976d5846b5c673e9..e347685d66f2bc815144f423787bc7d35e604582 100644 --- a/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch +++ b/patches/0003-libvlc-add-language-and-frame-rate-to-libvlc_media_t.patch @@ -1,13 +1,13 @@ -From d48944b701bddb7594446d2b43f64a62b3ff9afd Mon Sep 17 00:00:00 2001 +From 729b7568895cd6fa0b6a1b43c27a234132672bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Toque?= Date: Sun, 22 Apr 2012 09:35:52 +0200 -Subject: [PATCH 3/5] libvlc: add language and frame rate to +Subject: [PATCH 3/6] libvlc: add language and frame rate to libvlc_media_track_info_t --- - include/vlc/libvlc_media.h | 14 ++++++++++++++ - lib/media.c | 15 +++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) + include/vlc/libvlc_media.h | 14 ++++++++++++++ + lib/media.c | 15 +++++++++++++++ + 2 files changed, 29 insertions(+) diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h index f8b267d..5773ad2 100644 @@ -82,5 +82,5 @@ index 600e10a..ab33fd6 100644 + free( p_tracks ); +} -- -1.7.5.4 +1.7.12.1 diff --git a/patches/0004-add-ARM-NEON-version-of-simple-channel-mixer.patch b/patches/0004-add-ARM-NEON-version-of-simple-channel-mixer.patch index 894db6a2b823d186d790083b1defcc394ec7c4cc..0412e6524faaa4f29cd0cd002e7caf4765cbb511 100644 --- a/patches/0004-add-ARM-NEON-version-of-simple-channel-mixer.patch +++ b/patches/0004-add-ARM-NEON-version-of-simple-channel-mixer.patch @@ -1,14 +1,14 @@ -From d012ffe8db121c21012b645ce7ae0bcd7f3ba7b6 Mon Sep 17 00:00:00 2001 +From 8355dc787c57dcca1bdb4debd3a43608c5308854 Mon Sep 17 00:00:00 2001 From: David Geldreich Date: Sun, 20 May 2012 11:16:31 +0200 -Subject: [PATCH 4/5] add ARM/NEON version of simple channel mixer +Subject: [PATCH 4/6] add ARM/NEON version of simple channel mixer --- - modules/LIST | 1 + - modules/arm_neon/Modules.am | 8 + - modules/arm_neon/simple_channel_mixer.S | 279 +++++++++++++++++++++++++++++++ - modules/arm_neon/simple_channel_mixer.c | 171 +++++++++++++++++++ - 4 files changed, 459 insertions(+), 0 deletions(-) + modules/LIST | 1 + + modules/arm_neon/Modules.am | 8 + + modules/arm_neon/simple_channel_mixer.S | 279 ++++++++++++++++++++++++++++++++ + modules/arm_neon/simple_channel_mixer.c | 171 ++++++++++++++++++++ + 4 files changed, 459 insertions(+) create mode 100644 modules/arm_neon/simple_channel_mixer.S create mode 100644 modules/arm_neon/simple_channel_mixer.c @@ -513,5 +513,5 @@ index 0000000..515a390 + return VLC_EGENERIC; +} -- -1.7.5.4 +1.7.12.1 diff --git a/patches/0005-Android-fix-album-art-extraction.patch b/patches/0005-Android-fix-album-art-extraction.patch index 391912bd27251b2d4bc5d35f2c8f007cebc54a82..4df609a394441bc888df5a6564d1d2fe931f7db5 100644 --- a/patches/0005-Android-fix-album-art-extraction.patch +++ b/patches/0005-Android-fix-album-art-extraction.patch @@ -1,11 +1,11 @@ -From e25c37feb5743091291653329a7801926d7bb419 Mon Sep 17 00:00:00 2001 +From 503f74a0936ef5b812f1e1f083ddafc626aa76d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Toque?= Date: Fri, 22 Jun 2012 23:05:37 +0200 -Subject: [PATCH 5/5] Android: fix album art extraction +Subject: [PATCH 5/6] Android: fix album art extraction --- - src/playlist/art.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/playlist/art.c | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/src/playlist/art.c b/src/playlist/art.c index 9a93762..fbcb8c6 100644 @@ -24,5 +24,5 @@ index 9a93762..fbcb8c6 100644 if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) ) { -- -1.7.5.4 +1.7.12.1 diff --git a/patches/0006-Revert-avcodec-disable-threading-by-default.patch b/patches/0006-Revert-avcodec-disable-threading-by-default.patch index 08763bad97df98fa8a4990947f543ac01b13d93d..8672f39cf17dd025d1187b2c1e31b30aa88a36a6 100644 --- a/patches/0006-Revert-avcodec-disable-threading-by-default.patch +++ b/patches/0006-Revert-avcodec-disable-threading-by-default.patch @@ -1,4 +1,4 @@ -From 9552d400be547dde2bce2af1c2b0a48bd5fa9abd Mon Sep 17 00:00:00 2001 +From dee03508f38b5101cf5b58f3c795dfdb384e1dc6 Mon Sep 17 00:00:00 2001 From: Ludovic Fauvet Date: Tue, 25 Sep 2012 18:40:05 +0200 Subject: [PATCH 6/6] Revert "avcodec: disable threading by default"