Commit 8ff9e574 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update MVK to fix list based playback and thumbnails

parent 847c7a18
From 4c413d2186eb9539b0e48da5d6e75a304d2ae710 Mon Sep 17 00:00:00 2001
From 89565c4b412d8db0c73f5c3e66b75c7f2cb9fc54 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/10] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/13] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From ba2fc3de9aa04467b62a8c0a87bb022a4e643ff2 Mon Sep 17 00:00:00 2001
From 25263f49ca2f8438f567ed74051ad854894ad2a3 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/10] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/13] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From f79dc507e51242bc7deec1755ea979c740fb6aa0 Mon Sep 17 00:00:00 2001
From 5bb95788397dc4be5a497ed260497133392dba48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 29 May 2013 13:25:54 +0200
Subject: [PATCH 03/10] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 03/13] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 6daa2880fc458e706be9cda7d45e2cf65669cf88 Mon Sep 17 00:00:00 2001
From 211592b2a265569db5889e97d6c7eb9a111e4815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 04/10] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 04/13] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -11,10 +11,10 @@ Subject: [PATCH 04/10] freetype: added a fake font lookup mechanism for iOS to
3 files changed, 45 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 140c30d..3058ab1 100644
index f55e23a..bc508c6 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1199,6 +1199,8 @@ static int Create( vlc_object_t *p_this )
@@ -1206,6 +1206,8 @@ static int Create( vlc_object_t *p_this )
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
p_sys->pf_select = MacLegacy_Select;
......
From f318ca18e3480b84979f6917c186bb66ea7f69ed Mon Sep 17 00:00:00 2001
From 94130596a23559acf589b3248d75ff4a3d4f7dc6 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 05/10] contrib/gcrypt: simplify compilation by disabling /doc
Subject: [PATCH 05/13] contrib/gcrypt: simplify compilation by disabling /doc
and work-around a libtool limitation
---
......
From 32dce2b2176d82ab1fa00d063d92bde75ed76ad9 Mon Sep 17 00:00:00 2001
From ffc12c5e40be6990298cefd73d95be38f484ef56 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 06/10] lib/media player: inherit deinterlace variable to
Subject: [PATCH 06/13] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -9,10 +9,10 @@ Subject: [PATCH 06/10] 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 c727b6e..83d7a6d 100644
index 2136ab8..fc5a82f 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -596,7 +596,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -595,7 +595,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
......
From 157d8633a831b495a6235ee25c60d9fecdecf37b Mon Sep 17 00:00:00 2001
From 275aee51004bb7c934e787b9446a8d35f05f887d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 18 Feb 2015 21:35:16 +0100
Subject: [PATCH 07/10] arm_neon: work-around libtool issue
Subject: [PATCH 07/13] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From ee06c96b5781c138861a98bf01aa287d8790cc79 Mon Sep 17 00:00:00 2001
From 13a062f670cc6c3d9f5c6167bd8be64bb14ccf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jun 2015 15:26:06 +0200
Subject: [PATCH 08/10] libvlc/media: re-parse if flags changed
Subject: [PATCH 08/13] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
......
From d683acbcd14fc59cdcbebd5b7ef90c13b3e7b202 Mon Sep 17 00:00:00 2001
From b61af62ad15909d14676d5a2262a2d65b391e8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 10/10] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 09/13] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -67,10 +67,10 @@ index 487fcba..06c9826 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 83d7a6d..f15986d 100644
index fc5a82f..b9e8f42 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -626,6 +626,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -625,6 +625,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
......
From 01143837e290318cad524bf3bbae18ae1989706c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 13:40:26 +0200
Subject: [PATCH 10/13] libvlc media list player: attach observer after player
instance creation
---
lib/media_list_player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index e6119ea..44f75a0 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -495,6 +495,7 @@ libvlc_media_list_player_new(libvlc_instance_t * p_instance)
libvlc_event_manager_release(p_mlp->p_event_manager);
goto error;
}
+ install_media_player_observer(p_mlp);
if (vlc_clone(&p_mlp->thread, playlist_thread, p_mlp,
VLC_THREAD_PRIORITY_LOW))
--
2.5.1
From 98b46970488758b32361f7f7a6581d0930927da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 13:43:36 +0200
Subject: [PATCH 11/13] libvlc media list player: add getter player instance
---
include/vlc/libvlc_media_list_player.h | 10 ++++++++++
lib/libvlc.sym | 1 +
lib/media_list_player.c | 16 +++++++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/include/vlc/libvlc_media_list_player.h b/include/vlc/libvlc_media_list_player.h
index b85981d..71e2ac0 100644
--- a/include/vlc/libvlc_media_list_player.h
+++ b/include/vlc/libvlc_media_list_player.h
@@ -103,6 +103,16 @@ LIBVLC_API void
libvlc_media_player_t * p_mi );
/**
+ * Get media player instance in this media_list_player instance.
+ *
+ * \param p_mlp media list player instance
+ * \return p_mi media player instance
+ * \note the caller is responsible for releasing the player instance
+ */
+LIBVLC_API libvlc_media_player_t *
+ libvlc_media_list_player_get_media_player(libvlc_media_list_player_t * p_mlp);
+
+/**
* Set the media list associated with the player
*
* \param p_mlp media list player instance
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 06c9826..97b153b 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -109,6 +109,7 @@ libvlc_media_list_lock
libvlc_media_list_media
libvlc_media_list_new
libvlc_media_list_player_event_manager
+libvlc_media_list_player_get_media_player
libvlc_media_list_player_get_state
libvlc_media_list_player_is_playing
libvlc_media_list_player_new
diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index 44f75a0..b5a645e 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -1,10 +1,12 @@
/*****************************************************************************
* media_list_player.c: libvlc new API media_list player functions
*****************************************************************************
- * Copyright (C) 2007 VLC authors and VideoLAN
+ * Copyright (C) 2007-2015 VLC authors and VideoLAN
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
+ * Niles Bindel <zaggal69 # gmail.com>
+ * Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
@@ -601,6 +603,18 @@ void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_ml
}
/**************************************************************************
+ * get_media_player (Public)
+ **************************************************************************/
+libvlc_media_player_t * libvlc_media_list_player_get_media_player(libvlc_media_list_player_t * p_mlp)
+{
+ if (p_mlp->p_mi == NULL)
+ return NULL;
+
+ libvlc_media_player_retain(p_mlp->p_mi);
+ return p_mlp->p_mi;
+}
+
+/**************************************************************************
* set_media_list (Public)
**************************************************************************/
void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist)
--
2.5.1
From f5cebbdbdcbda90664b2daf3fbf727f060a1cca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 14:04:52 +0200
Subject: [PATCH 12/13] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
modules/arm_neon/simple_channel_mixer.S | 46 +++++++++++++--------------------
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
index 5938118..42f0d00 100644
--- a/modules/arm_neon/amplify.S
+++ b/modules/arm_neon/amplify.S
@@ -18,6 +18,8 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
+#include "asm.S"
+
.syntax unified
.arm
.fpu neon
@@ -27,9 +29,7 @@
#define SRC r1
#define SIZE r2
.align 2
- .global amplify_float_arm_neon
- .type amplify_float_arm_neon, %function
-amplify_float_arm_neon:
+function amplify_float_arm_neon, export=1
cmp SIZE, #0
bxeq lr
#ifdef __ARM_PCS
@@ -79,3 +79,4 @@ amplify_float_arm_neon:
4: vst1.f32 {d20-d21}, [DST,:128]!
5: vst1.f32 {d16-d17}, [DST,:128]!
bx lr
+endfunc
diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
index a94ae85..54b43a7 100644
--- a/modules/arm_neon/simple_channel_mixer.S
+++ b/modules/arm_neon/simple_channel_mixer.S
@@ -19,6 +19,8 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
+#include "asm.S"
+
.fpu neon
.text
.align 2
@@ -34,9 +36,7 @@ coeff_7to2:
.float 0.5
.float 0.25
.float 0.25
- .global convert_7_x_to_2_0_neon_asm
- .type convert_7_x_to_2_0_neon_asm, %function
-convert_7_x_to_2_0_neon_asm:
+function convert_7_x_to_2_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_7to2
@@ -63,6 +63,7 @@ convert_7_x_to_2_0_neon_asm:
bne 0b
pop {r4,pc}
+endfunc
coeff_5to2:
@@ -70,9 +71,7 @@ coeff_5to2:
.float 0.5
.float 0.33
.float 0.33
- .global convert_5_x_to_2_0_neon_asm
- .type convert_5_x_to_2_0_neon_asm, %function
-convert_5_x_to_2_0_neon_asm:
+function convert_5_x_to_2_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_5to2
@@ -95,14 +94,13 @@ convert_5_x_to_2_0_neon_asm:
bne 0b
pop {r4,pc}
+endfunc
coeff_4to2:
.float 0.5
.float 0.5
- .global convert_4_0_to_2_0_neon_asm
- .type convert_4_0_to_2_0_neon_asm, %function
-convert_4_0_to_2_0_neon_asm:
+function convert_4_0_to_2_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_4to2
@@ -119,14 +117,12 @@ convert_4_0_to_2_0_neon_asm:
bne 0b
pop {r4,pc}
-
+endfunc
coeff_3to2:
.float 0.5
.float 0.5
- .global convert_3_x_to_2_0_neon_asm
- .type convert_3_x_to_2_0_neon_asm, %function
-convert_3_x_to_2_0_neon_asm:
+function convert_3_x_to_2_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_3to2
@@ -147,16 +143,14 @@ convert_3_x_to_2_0_neon_asm:
bne 0b
pop {r4,pc}
-
+endfunc
coeff_7to1:
.float 0.25
.float 0.25
.float 0.125
.float 0.125
- .global convert_7_x_to_1_0_neon_asm
- .type convert_7_x_to_1_0_neon_asm, %function
-convert_7_x_to_1_0_neon_asm:
+function convert_7_x_to_1_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_7to1
@@ -181,6 +175,7 @@ convert_7_x_to_1_0_neon_asm:
bne 0b
pop {r4,pc}
+endfunc
coeff_5to1:
@@ -188,9 +183,7 @@ coeff_5to1:
.float 0.25
.float 0.16666667
.float 0.16666667
- .global convert_5_x_to_1_0_neon_asm
- .type convert_5_x_to_1_0_neon_asm, %function
-convert_5_x_to_1_0_neon_asm:
+function convert_5_x_to_1_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_5to1
@@ -212,16 +205,14 @@ convert_5_x_to_1_0_neon_asm:
bne 0b
pop {r4,pc}
-
+endfunc
coeff_7to4:
.float 0.5
.float 0.5
.float 0.16666667
.float 0.16666667
- .global convert_7_x_to_4_0_neon_asm
- .type convert_7_x_to_4_0_neon_asm, %function
-convert_7_x_to_4_0_neon_asm:
+function convert_7_x_to_4_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_7to4
@@ -247,14 +238,12 @@ convert_7_x_to_4_0_neon_asm:
bne 0b
pop {r4,pc}
-
+endfunc
coeff_5to4:
.float 0.5
.float 0.5
- .global convert_5_x_to_4_0_neon_asm
- .type convert_5_x_to_4_0_neon_asm, %function
-convert_5_x_to_4_0_neon_asm:
+function convert_5_x_to_4_0_neon_asm, export=1
push {r4,lr}
adr COEFF, coeff_5to4
@@ -277,3 +266,4 @@ convert_5_x_to_4_0_neon_asm:
bne 0b
pop {r4,pc}
+endfunc
--
2.5.1
From c2686297ba6b8360d61c4d87dce79f7d36b4d596 Mon Sep 17 00:00:00 2001
From 397f6aead4e316e64f1ca220f407da274ddb6faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Jul 2015 19:57:18 +0200
Subject: [PATCH 09/10] disable neon volume plugin
Subject: [PATCH 13/13] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=d185cfaa
TESTEDHASH=1d69a9c6
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