Commit dcf677ef authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: Update libvlc

parent 24382764
From da6ea85fb9bc280a3a13d83c9646bb06c85edcae Mon Sep 17 00:00:00 2001
From 89fe350352e13662f05d9cd513453a999d72eed9 Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/14] arm_neon: added function macro to handle the underscore
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.6.3
2.7.0
From de93afd7c3cda1a71e7e16bbf26775c68ce590c1 Mon Sep 17 00:00:00 2001
From a4343a11f961b1f08f7a92aead30d0e96cacdad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 17 Apr 2012 16:41:19 +0200
Subject: [PATCH 02/14] progress dialog: add missing sanity check
......@@ -8,10 +8,10 @@ Subject: [PATCH 02/14] progress dialog: add missing sanity check
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index f90e7c8..dcfb5dd 100644
index 3a0a36e..a9ac2e5 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -251,7 +251,11 @@ void dialog_ProgressDestroy (dialog_progress_bar_t *dialog)
@@ -254,7 +254,11 @@ void dialog_ProgressDestroy (dialog_progress_bar_t *dialog)
{
assert (dialog);
......@@ -25,5 +25,5 @@ index f90e7c8..dcfb5dd 100644
}
--
2.6.3
2.7.0
From 6f6f8666a39a5db18e418b9f0e21c0f933dca773 Mon Sep 17 00:00:00 2001
From eead5b3bc749aac3ca386c74115173dfd357e261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 03/14] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.6.3
2.7.0
From 7773df0ee0a05040d36662df5c51288503ca314f Mon Sep 17 00:00:00 2001
From 391e3cbe35e04ed8ae668f941364872c1fce8005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 9 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/14] lib/media player: inherit deinterlace variable to
......@@ -9,7 +9,7 @@ Subject: [PATCH 04/14] lib/media player: inherit deinterlace variable to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index 2dee2d7..3ff4b8a 100644
index 58b2de9..533988f 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -610,7 +610,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -22,5 +22,5 @@ index 2dee2d7..3ff4b8a 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.6.3
2.7.0
From fa183b97d89524217d4dd6118dc3550c0bc199ac Mon Sep 17 00:00:00 2001
From 22010c4234d36daec2e8ef5963d588f46f61ffee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/14] arm_neon: work-around libtool issue
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.6.3
2.7.0
From 3cb43dbeb71815062a4995f3edb7c5d0cfd561b9 Mon Sep 17 00:00:00 2001
From 36b1c82b3e35347880b9b5a091be8f29859a75d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Dec 2014 22:14:55 +0100
Subject: [PATCH 06/14] libvlc/media: re-parse if flags changed
......@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
/* Media Descriptor */
--
2.6.3
2.7.0
From 795dc7fd5444c5cceda5caf664940fdf727cbdea Mon Sep 17 00:00:00 2001
From 482035e9b1731660fe0cd3c3da64033fce0fa7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 07/14] arm_neon: fix iOS linking
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.6.3
2.7.0
From 22a77ffea4e19feb9465371fe84855c2812301ba Mon Sep 17 00:00:00 2001
From 7c0963d6a837fc01e8ffc63f3066fcf601d6ac7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 08/14] disable neon volume plugin
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.6.3
2.7.0
From f93dfffd7f4d1f729dc9ea54283a6153fb6ac7b0 Mon Sep 17 00:00:00 2001
From 02ff60bc966d7bf9e9b4a1c9eae844f9cd51a52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 09/14] contrib/gcrypt: work-around a libtool limitation
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.6.3
2.7.0
From 4443532c37bb8fe106d85b28769b8dd2a9506752 Mon Sep 17 00:00:00 2001
From 37ad7cbfc7949040026aded5c0837e78d00cb3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 10/14] src/misc: fix compilation for OS without fork()
......@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
{
pid_t pid = fork();
--
2.6.3
2.7.0
From b90c7ddc5cd0a314a3c86aa3ae686bd0e07b0806 Mon Sep 17 00:00:00 2001
From a77b80e061de3c34656a35f9203d2aaa9232f651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 18:34:26 +0200
Subject: [PATCH 11/14] libvlc: hack to disable daemon mode
......@@ -23,5 +23,5 @@ index a7d9a69..c8b5c7a 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.6.3
2.7.0
From 57d4898f9067434f64245d927f4ffc40264f24d0 Mon Sep 17 00:00:00 2001
From f8b5407944791f961900fdca8dd83c6fe3ef5b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 12/14] contrib/gcrypt: fix tvOS compilation
......@@ -56,5 +56,5 @@ index 0471522..ac20d02 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.6.3
2.7.0
From debcb791d4e16bc7029c6e85353c074a4694fa23 Mon Sep 17 00:00:00 2001
From 245dcb464a0105c10e4f31b07ec655b6edc766e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:46:27 +0100
Subject: [PATCH 13/14] contrib/harfbuzz: fix iOS compilation when CoreText is
......@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.6.3
2.7.0
From 5d1874d24159c8ad4541d5e00ec7319c86cd896a Mon Sep 17 00:00:00 2001
From 5efe94bd6eb06acb6055eb1a45e27269522dc215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:09:24 +0100
Subject: [PATCH 14/14] libvlc: expose a base set of freetype options to
......@@ -8,16 +8,16 @@ Subject: [PATCH 14/14] libvlc: expose a base set of freetype options to
include/vlc/libvlc_media_player.h | 26 ++++++++++++
lib/libvlc.sym | 6 +++
lib/media_player.c | 6 +++
lib/video.c | 66 +++++++++++++++++++++++++++++++
modules/text_renderer/freetype/freetype.c | 58 +++++++++++++++++++++++++--
lib/video.c | 68 ++++++++++++++++++++++++++++++-
modules/text_renderer/freetype/freetype.c | 59 +++++++++++++++++++++++++--
modules/text_renderer/freetype/freetype.h | 2 +
6 files changed, 161 insertions(+), 3 deletions(-)
6 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 6614340..ef5c54c 100644
index 76443c1..23a0183 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1515,6 +1515,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1521,6 +1521,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
unsigned option, float value );
......@@ -51,7 +51,7 @@ index 6614340..ef5c54c 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 49207db..88d2478 100644
index 49207db..15fa384 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -229,6 +229,9 @@ libvlc_video_get_spu_count
......@@ -59,8 +59,8 @@ index 49207db..88d2478 100644
libvlc_video_get_spu_description
libvlc_video_get_teletext
+libvlc_video_get_textrenderer_bool
+libvlc_video_get_text_renderer_int
+libvlc_video_get_text_renderer_string
+libvlc_video_get_textrenderer_int
+libvlc_video_get_textrenderer_string
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
......@@ -69,13 +69,13 @@ index 49207db..88d2478 100644
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
+libvlc_video_set_textrenderer_bool
+libvlc_video_set_text_renderer_int
+libvlc_video_set_text_renderer_string
+libvlc_video_set_textrenderer_int
+libvlc_video_set_textrenderer_string
libvlc_video_set_track
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 3ff4b8a..dca0ffc 100644
index 533988f..7ab8954 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -640,6 +640,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -92,9 +92,18 @@ index 3ff4b8a..dca0ffc 100644
var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create (mp, "audio-device", VLC_VAR_STRING);
diff --git a/lib/video.c b/lib/video.c
index b2c9b34..a18d711 100644
index b2c9b34..6af4e1c 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -635,7 +635,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
}
typedef const struct {
- const char name[20];
+ const char name[25];
unsigned type;
} opt_t;
@@ -664,6 +664,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
case VLC_VAR_FLOAT:
var_SetFloat( p_mi, opt->name, value );
......@@ -180,7 +189,7 @@ index b2c9b34..a18d711 100644
+ return get_string( p_mi, "freetype", textrenderer_option_bynumber(option) );
+}
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 3409460..acb8c08 100644
index 3409460..4e3da96 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -77,6 +77,9 @@
......@@ -254,7 +263,7 @@ index 3409460..acb8c08 100644
/* Attachments */
if( p_sys->pp_font_attachments )
{
@@ -1353,3 +1375,33 @@ static void Destroy( vlc_object_t *p_this )
@@ -1353,3 +1375,34 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys );
}
......@@ -270,9 +279,9 @@ index 3409460..acb8c08 100644
+ if( !strcmp( psz_var, "freetype-font" ) ) {
+ FREENULL( p_sys->p_default_style->psz_fontname );
+ p_sys->p_default_style->psz_fontname = strdup( newval.psz_string );
+ } else if( !strcmp( psz_var, "freetype-rel-fontsize" ) )
+ p_sys->p_forced_style->f_font_relsize = (int)p_filter->fmt_out.video.i_height / newval.i_int;
+ else if( !strcmp( psz_var, "freetype-color" ) )
+ } else if( !strcmp( psz_var, "freetype-rel-fontsize" ) ) {
+ p_sys->p_forced_style->f_font_relsize = 1.0 / newval.i_int;
+ } else if( !strcmp( psz_var, "freetype-color" ) )
+ p_sys->p_default_style->i_font_color = VLC_CLIP(newval.i_int, 0, 0xFFFFFF);
+ else if ( !strcmp( psz_var, "freetype-bold" ) )
+ {
......@@ -284,6 +293,7 @@ index 3409460..acb8c08 100644
+ p_sys->p_forced_style->i_features &= ~STYLE_HAS_FLAGS;
+ }
+ }
+ text_style_Merge( p_sys->p_default_style, p_sys->p_forced_style, true );
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
......@@ -302,5 +312,5 @@ index 44b2731..7f1abec 100644
/**
--
2.6.3
2.7.0
......@@ -16,7 +16,7 @@ SKIPLIBVLCCOMPILATION=no
SCARY=yes
TVOS=no
TESTEDHASH=6927b44a
TESTEDHASH=1464d905
usage()
{
......
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