Commit 81f3932c authored by Edward Wang's avatar Edward Wang

Update and refresh to latest vlc.git

parent 2d926b3a
......@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
# 1/ libvlc, libvlccore and its plugins
TESTED_HASH=11f08a58d0f
TESTED_HASH=63c78d4
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
......
From 6db17a74d36e03c198e513dd26bb78a9c7b311ae Mon Sep 17 00:00:00 2001
From 54572a6b6a895706cabd9ca77b2007fe3055f6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Sat, 10 Mar 2012 04:54:23 -0500
Subject: [PATCH 1/5] android: threads support
......@@ -33,14 +33,14 @@ 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 | 245 +++++++++++++++++++++++++++++++++++++++++++------
4 files changed, 257 insertions(+), 28 deletions(-)
src/posix/thread.c | 244 +++++++++++++++++++++++++++++++++++++++++++------
4 files changed, 256 insertions(+), 28 deletions(-)
diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index ebf94e2..dad50b1 100644
index 7fcbf25..a32375f 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -43,6 +43,15 @@
@@ -42,6 +42,15 @@
# define pthread_sigmask sigprocmask
......@@ -56,7 +56,7 @@ index ebf94e2..dad50b1 100644
#else /* pthreads (like Linux & BSD) */
# define LIBVLC_USE_PTHREAD 1
# define LIBVLC_USE_PTHREAD_CANCEL 1
@@ -118,7 +127,11 @@
@@ -117,7 +126,11 @@
*****************************************************************************/
#if defined (LIBVLC_USE_PTHREAD)
......@@ -102,10 +102,10 @@ index d053faa..52840e8 100644
vlc_mutex_unlock (&lock);
}
diff --git a/src/Makefile.am b/src/Makefile.am
index d8f4890..37bf044 100644
index 9572480..40c71de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,6 +195,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
@@ -198,6 +198,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_darwin) \
$(SOURCES_libvlc_linux) \
......@@ -113,7 +113,7 @@ index d8f4890..37bf044 100644
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_os2) \
$(SOURCES_libvlc_other) \
@@ -205,6 +206,9 @@ EXTRA_libvlccore_la_SOURCES = \
@@ -208,6 +209,9 @@ EXTRA_libvlccore_la_SOURCES = \
if HAVE_DARWIN
libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
else
......@@ -123,7 +123,7 @@ index d8f4890..37bf044 100644
if HAVE_LINUX
libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
else
@@ -227,6 +231,7 @@ endif
@@ -226,6 +230,7 @@ endif
endif
endif
endif
......@@ -131,7 +131,7 @@ index d8f4890..37bf044 100644
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
@@ -247,6 +252,18 @@ SOURCES_libvlc_darwin = \
@@ -246,6 +251,18 @@ SOURCES_libvlc_darwin = \
posix/rand.c \
$(NULL)
......@@ -151,7 +151,7 @@ index d8f4890..37bf044 100644
posix/dirs.c \
posix/filesystem.c \
diff --git a/src/posix/thread.c b/src/posix/thread.c
index cc5381e..e528499 100644
index 5da8805..965c516 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -1,5 +1,5 @@
......@@ -376,15 +376,7 @@ index cc5381e..e528499 100644
}
/**
@@ -828,6 +948,7 @@ int vlc_set_priority (vlc_thread_t th, int priority)
return VLC_EGENERIC;
}
#else
+ (void) th;
(void) priority;
#endif
return VLC_SUCCESS;
@@ -842,10 +963,25 @@ int vlc_set_priority (vlc_thread_t th, int priority)
@@ -842,10 +962,25 @@ int vlc_set_priority (vlc_thread_t th, int priority)
*/
void vlc_cancel (vlc_thread_t thread_id)
{
......@@ -414,7 +406,7 @@ index cc5381e..e528499 100644
}
/**
@@ -858,11 +994,13 @@ void vlc_cancel (vlc_thread_t thread_id)
@@ -858,11 +993,13 @@ void vlc_cancel (vlc_thread_t thread_id)
*/
int vlc_savecancel (void)
{
......@@ -432,7 +424,7 @@ index cc5381e..e528499 100644
}
/**
@@ -872,18 +1010,19 @@ int vlc_savecancel (void)
@@ -872,18 +1009,19 @@ int vlc_savecancel (void)
*/
void vlc_restorecancel (int state)
{
......@@ -458,7 +450,7 @@ index cc5381e..e528499 100644
#endif
}
@@ -896,13 +1035,48 @@ void vlc_restorecancel (int state)
@@ -896,13 +1034,48 @@ void vlc_restorecancel (int state)
*/
void vlc_testcancel (void)
{
......@@ -510,7 +502,7 @@ index cc5381e..e528499 100644
}
/**
@@ -979,8 +1153,23 @@ void msleep (mtime_t delay)
@@ -979,8 +1152,23 @@ void msleep (mtime_t delay)
while (clock_nanosleep (vlc_clock_id, 0, &ts, &ts) == EINTR);
#else
......
From c93ba47a19e0b668282ab8336608939435d1dd2d Mon Sep 17 00:00:00 2001
From 0686a550cbb87e33b6162158f61e7d9de80e50b5 Mon Sep 17 00:00:00 2001
From: Ming Hu <tewilove@gmail.com>
Date: Sun, 13 May 2012 22:20:34 +0200
Subject: [PATCH 2/5] Android: add native AudioTrack aout module
......@@ -12,10 +12,10 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
create mode 100644 modules/audio_output/audiotrack.c
diff --git a/configure.ac b/configure.ac
index f1174d4..ed94961 100644
index 8fbcd81..131fc0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3586,6 +3586,18 @@ if test "${HAVE_ANDROID}" = "1"; then
@@ -3548,6 +3548,18 @@ if test "${HAVE_ANDROID}" = "1"; then
fi
dnl
......@@ -35,10 +35,10 @@ index f1174d4..ed94961 100644
dnl
PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto])
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 8051672..c4ca373 100644
index a0936f1..2227dfc 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -3,6 +3,7 @@ SOURCES_waveout = waveout.c windows_audio_common.h packet.c
@@ -2,6 +2,7 @@ SOURCES_waveout = waveout.c windows_audio_common.h packet.c
SOURCES_auhal = auhal.c packet.c
SOURCES_audioqueue = audioqueue.c packet.c
SOURCES_opensles_android = opensles_android.c
......
From 796397ae813096cb86e3effd9b6709e2039be8d4 Mon Sep 17 00:00:00 2001
From d48944b701bddb7594446d2b43f64a62b3ff9afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Sun, 22 Apr 2012 09:35:52 +0200
Subject: [PATCH 3/3] libvlc: add language and frame rate to
Subject: [PATCH 3/5] 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(+)
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 279a29c..d4b1524 100644
index f8b267d..5773ad2 100644
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -164,9 +164,12 @@ typedef struct libvlc_media_track_info_t
......@@ -26,7 +26,7 @@ index 279a29c..d4b1524 100644
} libvlc_media_track_info_t;
@@ -504,6 +507,17 @@ LIBVLC_API
@@ -512,6 +515,17 @@ LIBVLC_API
int libvlc_media_get_tracks_info( libvlc_media_t *p_md,
libvlc_media_track_info_t **tracks );
......@@ -45,10 +45,10 @@ index 279a29c..d4b1524 100644
# ifdef __cplusplus
diff --git a/lib/media.c b/lib/media.c
index 2c01c80..b3f5a9a 100644
index 600e10a..ab33fd6 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -707,6 +707,8 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
@@ -706,6 +706,8 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
p_mes->i_codec = p_es->i_codec;
p_mes->i_id = p_es->i_id;
......@@ -57,7 +57,7 @@ index 2c01c80..b3f5a9a 100644
p_mes->i_profile = p_es->i_profile;
p_mes->i_level = p_es->i_level;
@@ -720,6 +722,7 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
@@ -719,6 +721,7 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
p_mes->i_type = libvlc_track_video;
p_mes->u.video.i_height = p_es->video.i_height;
p_mes->u.video.i_width = p_es->video.i_width;
......@@ -65,7 +65,7 @@ index 2c01c80..b3f5a9a 100644
break;
case AUDIO_ES:
p_mes->i_type = libvlc_track_audio;
@@ -735,3 +738,15 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
@@ -734,3 +737,15 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t **
vlc_mutex_unlock( &p_input_item->lock );
return i_es;
}
......@@ -82,5 +82,5 @@ index 2c01c80..b3f5a9a 100644
+ free( p_tracks );
+}
--
1.7.10.2
1.7.5.4
From d8ba9cd813625fb4cfecd1d4207ea3d27cd0e4a8 Mon Sep 17 00:00:00 2001
From c761c0665c0fd9d3cf5fee05979a87d86795b0ab Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Sun, 20 May 2012 11:16:31 +0200
Subject: [PATCH] add ARM/NEON version of simple channel mixer
Subject: [PATCH 4/5] add ARM/NEON version of simple channel mixer
---
modules/LIST | 1 +
......@@ -13,10 +13,10 @@ Subject: [PATCH] add ARM/NEON version of simple channel mixer
create mode 100644 modules/arm_neon/simple_channel_mixer.c
diff --git a/modules/LIST b/modules/LIST
index f6dda85..a586069 100644
index 52b34c3..fc82183 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -291,6 +291,7 @@ $Id$
@@ -287,6 +287,7 @@ $Id$
* shine: MP3 encoder using Shine, a fixed point implementation
* sid: Sidplay demuxer
* simple_channel_mixer: channel mixer
......@@ -25,12 +25,12 @@ index f6dda85..a586069 100644
* smf: Standard MIDI file demuxer
* sndio: OpenBSD sndio audio output
diff --git a/modules/arm_neon/Modules.am b/modules/arm_neon/Modules.am
index b60011b..ca6c2ff 100644
index 498368a..4f2af9e 100644
--- a/modules/arm_neon/Modules.am
+++ b/modules/arm_neon/Modules.am
@@ -9,6 +9,13 @@ libaudio_format_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
@@ -8,6 +8,13 @@ libaudio_format_neon_plugin_la_SOURCES = \
libaudio_format_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libaudio_format_neon_plugin_la_LIBADD = $(AM_LIBADD)
libaudio_format_neon_plugin_la_DEPENDENCIES =
+libsimple_channel_mixer_neon_plugin_la_SOURCES = \
+ simple_channel_mixer.S \
......@@ -42,7 +42,7 @@ index b60011b..ca6c2ff 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
i420_yuyv.S \
i422_yuyv.S \
@@ -34,6 +41,7 @@ libyuv_rgb_neon_plugin_la_DEPENDENCIES =
@@ -30,6 +37,7 @@ libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += \
libaudio_format_neon_plugin.la \
......
From 333b15549243936ad7c559bf1930f3b358e9a254 Mon Sep 17 00:00:00 2001
From e25c37feb5743091291653329a7801926d7bb419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
Date: Fri, 22 Jun 2012 23:05:37 +0200
Subject: [PATCH] Android: fix album art extraction
Subject: [PATCH 5/5] Android: fix album art extraction
---
src/playlist/art.c | 4 ++++
1 file changed, 4 insertions(+)
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/playlist/art.c b/src/playlist/art.c
index 79ca30f..6f8b9db 100644
index 9a93762..fbcb8c6 100644
--- a/src/playlist/art.c
+++ b/src/playlist/art.c
@@ -64,7 +64,11 @@ static char* ArtCacheGetDirPath( const char *psz_arturl, const char *psz_artist,
......@@ -24,5 +24,5 @@ index 79ca30f..6f8b9db 100644
if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
{
--
1.7.9.5
1.7.5.4
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