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

Init 2.8 branch

parent e0c12153
From b76716c32dc2df53e9185a7a3c143ca8745b7cfd Mon Sep 17 00:00:00 2001
From 1216eeee13c2c0c62d269666d19ffce77b2babb9 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/15] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/17] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.8.3
2.8.4
From 332ad4c74502cd5573a87a688f50249f2088c64b Mon Sep 17 00:00:00 2001
From 111b227ca618b3aed097d30b8ec29cc62e5e7cf6 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 02/15] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/17] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.8.3
2.8.4
From 986ead6eb5458cceb8ee40050d14a89fa8142638 Mon Sep 17 00:00:00 2001
From 8a3d766521a339eebe5e8651ceb84dc136b68885 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 03/15] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/17] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -22,5 +22,5 @@ index a0860da..b2ac614 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.8.3
2.8.4
From d3a03e01b6b94dd4b57d501a838ad599885134cb Mon Sep 17 00:00:00 2001
From f171f7ae67210c846f65bfd2d3b5ce4be275257f 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 04/15] arm_neon: work-around libtool issue
Subject: [PATCH 04/17] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.8.3
2.8.4
From ef584fba4a0b187c3bd84c4549e9b0f1d7bb6e14 Mon Sep 17 00:00:00 2001
From 5e5a8ee85f308f0f7ebbadba7da571dd388409db 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 05/15] arm_neon: fix iOS linking
Subject: [PATCH 05/17] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.8.3
2.8.4
From 95f5d222a633fd9db3efb73c949e6dec9cf96dd2 Mon Sep 17 00:00:00 2001
From 858fccf117b90e18530092d9fa00dfce95b373c3 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 06/15] disable neon volume plugin
Subject: [PATCH 06/17] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.8.3
2.8.4
From f2a2a78cef26c6ee36dfe76441315f622d79b890 Mon Sep 17 00:00:00 2001
From 180b8da79591647b6be18b7ab12a32d11bc1522f 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 07/15] src/misc: fix compilation for OS without fork()
Subject: [PATCH 07/17] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
......@@ -21,5 +21,5 @@ index 28f127a..bacf842 100644
{
pid_t pid = fork();
--
2.8.3
2.8.4
From dc4265966a0da0cd723bd5276507ce442208e718 Mon Sep 17 00:00:00 2001
From 6094282f91f43b8dae4be31f5dd9c00c1a833fa1 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 08/15] libvlc: hack to disable daemon mode
Subject: [PATCH 08/17] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......@@ -23,5 +23,5 @@ index 3ccdede..d5abe35 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.8.3
2.8.4
From dff50f2f4e487f5064fd86ce6b8f534435c1a11e Mon Sep 17 00:00:00 2001
From 853a3bbbae62cda2631613882f0c98f56c7577f3 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 09/15] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 09/17] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.8.3
2.8.4
From 704f77ecc4af8569b67168cf265645ea050c3ade Mon Sep 17 00:00:00 2001
From a379f35abf7b8d9da3b2b35782b01d273de39f45 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 10/15] libvlc: expose a base set of freetype options to
Subject: [PATCH 10/17] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
/**
--
2.8.3
2.8.4
From e8a1f2adbedbe5ccf874cd76568e3ab1617b0eee Mon Sep 17 00:00:00 2001
From 242508605ae0a1ef3067e961e8c17c3bbfd9b281 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 11/15] Add AC-3 pass-through
Subject: [PATCH 11/17] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -163,5 +163,5 @@ index 044905b..355f14f 100644
return OpenCommon( p_this, false );
}
--
2.8.3
2.8.4
From 07a474025b48260c578f9cbb43cf3baa8fc3959e Mon Sep 17 00:00:00 2001
From 879316ecde3c946332f06cc17e718cce37d46dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 4 May 2016 16:00:40 +0200
Subject: [PATCH 12/15] libvlc: create VT-zero-copy variable
Subject: [PATCH 12/17] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......@@ -20,5 +20,5 @@ index 9e2f137..a587d85 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.8.3
2.8.4
From acf26a2785e4cae308842c6abd7e689896108cd1 Mon Sep 17 00:00:00 2001
From b2e4dffccac4dd684084a82542f9dba7471e3810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 9 May 2016 11:49:20 +0200
Subject: [PATCH 13/15] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 13/17] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
......@@ -25,5 +25,5 @@ index a266389..b103de7 100644
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else
--
2.8.3
2.8.4
From d03ab429db65fedce3528553651f2c4221efa381 Mon Sep 17 00:00:00 2001
From 62e3ebee8db935bdb261ffd9650e151d017aedc2 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 14/15] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 14/17] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.8.3
2.8.4
From 51205f1deef3f3f12edafcdf20a871be3c264447 Mon Sep 17 00:00:00 2001
From d8e31da3769e7c46802e31f039962f459815f5dd 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 15/15] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 15/17] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -56,5 +56,5 @@ index 26725cc..ffb159e 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.8.3
2.8.4
From 2902eabd89f4a1ce4c7db74a9123dcce21416404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 26 Oct 2015 10:47:56 +0100
Subject: [PATCH 16/17] disable videotoolbox
---
extras/package/ios/build.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index b0901ae..97859a9 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -487,6 +487,8 @@ output_http
output_livehttp
libmux
stream_out
+videotoolbox
+cvpx_i420
"
if [ "$SCARY" = "no" ]; then
--
2.8.4
From 0be665619c3a2d780c44e8569c2765519caac73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 26 Oct 2015 10:50:26 +0100
Subject: [PATCH 17/17] Revert 'libvlc: refactor sfilter enabling/disabling'
This reverts commit 93900cd71aff74d4eec617d8f87be97427f83101.
---
lib/video.c | 66 +++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 49 insertions(+), 17 deletions(-)
diff --git a/lib/video.c b/lib/video.c
index 6af4e1c..09ebd7c 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -613,27 +613,25 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
/* module helpers */
/* ************** */
-static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *restrict name )
+static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
+ const char *name )
{
+ vlc_object_t *object;
vout_thread_t *vout = GetVout( p_mi, 0 );
- if (!vout)
- return false;
- char *psz_sources = var_GetString( vout, "sub-source" );
- if( !psz_sources )
+ if( vout )
{
- libvlc_printerr( "%s not enabled", name );
- vlc_object_release( vout );
- return false;
+ object = vlc_object_find_name( vout, name );
+ vlc_object_release(vout);
}
+ else
+ object = NULL;
- /* Find 'name' */
- char *p = strstr( psz_sources, name );
- free( psz_sources );
- vlc_object_release( vout );
- return (p != NULL);
+ if( !object )
+ libvlc_printerr( "%s not enabled", name );
+ return object;
}
-
+
typedef const struct {
const char name[25];
unsigned type;
@@ -671,8 +669,17 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
return;
}
+
+ var_SetInteger(p_mi, opt->name, value);
+ vlc_object_t *object = get_object( p_mi, name );
+ if( object )
+ {
+ var_SetInteger(object, opt->name, value);
+ vlc_object_release( object );
+ }
}
+
static int
get_int( libvlc_media_player_t *p_mi, const char *restrict name,
const opt_t *restrict opt )
@@ -683,8 +690,9 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
{
case 0: /* the enabler */
{
- bool b_enabled = find_sub_source_by_name( p_mi, name );
- return b_enabled ? 1 : 0;
+ vlc_object_t *object = get_object( p_mi, name );
+ vlc_object_release( object );
+ return object != NULL;
}
case VLC_VAR_INTEGER:
return var_GetInteger(p_mi, opt->name);
@@ -698,6 +706,7 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
}
}
+
static void
set_float( libvlc_media_player_t *p_mi, const char *restrict name,
const opt_t *restrict opt, float value )
@@ -711,14 +720,23 @@ set_float( libvlc_media_player_t *p_mi, const char *restrict name,
}
var_SetFloat( p_mi, opt->name, value );
+
+ vlc_object_t *object = get_object( p_mi, name );
+ if( object )
+ {
+ var_SetFloat(object, opt->name, value );
+ vlc_object_release( object );
+ }
}
+
static float
get_float( libvlc_media_player_t *p_mi, const char *restrict name,
const opt_t *restrict opt )
{
if( !opt ) return 0.0;
+
if( opt->type != VLC_VAR_FLOAT )
{
libvlc_printerr( "Invalid argument to %s in %s", name, "get float" );
@@ -728,6 +746,7 @@ get_float( libvlc_media_player_t *p_mi, const char *restrict name,
return var_GetFloat( p_mi, opt->name );
}
+
static void
set_string( libvlc_media_player_t *p_mi, const char *restrict name,
const opt_t *restrict opt, const char *restrict psz_value )
@@ -741,8 +760,16 @@ set_string( libvlc_media_player_t *p_mi, const char *restrict name,
}
var_SetString( p_mi, opt->name, psz_value );
+
+ vlc_object_t *object = get_object( p_mi, name );
+ if( object )
+ {
+ var_SetString(object, opt->name, psz_value );
+ vlc_object_release( object );
+ }
}
+
static char *
get_string( libvlc_media_player_t *p_mi, const char *restrict name,
const opt_t *restrict opt )
@@ -758,6 +785,7 @@ get_string( libvlc_media_player_t *p_mi, const char *restrict name,
return var_GetString( p_mi, opt->name );
}
+
static const opt_t *
marq_option_bynumber(unsigned option)
{
@@ -782,6 +810,8 @@ marq_option_bynumber(unsigned option)
return r;
}
+static vlc_object_t *get_object( libvlc_media_player_t *, const char *);
+
/*****************************************************************************
* libvlc_video_get_marquee_int : get a marq option value
*****************************************************************************/
@@ -821,6 +851,7 @@ void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
/* logo module support */
+
static const opt_t *
logo_option_bynumber( unsigned option )
{
@@ -844,10 +875,11 @@ logo_option_bynumber( unsigned option )
return r;
}
+
void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi,
unsigned option, const char *psz_value )
{
- set_string( p_mi,"logo",logo_option_bynumber(option), psz_value );
+ set_string( p_mi,"logo",logo_option_bynumber(option),psz_value );
}
--
2.8.4
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=9fab6639
TESTEDHASH=b2fa4ce4
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