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

MVK: fix ASS decoding

parent 03bbacbf
From 75adb62914bb5a32780d36b8fc7ef052baed835f Mon Sep 17 00:00:00 2001
From 150fe8d8cd5262be1f4b8cb23c666fea8966e5eb 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/20] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/19] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From bc32cde851a3c29b0fd46b9a0dbf262b79d90c48 Mon Sep 17 00:00:00 2001
From 9ffdd233d5ef6b0d36277be04fe90a24a9cf53e1 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/20] progress dialog: add missing sanity check
Subject: [PATCH 02/19] progress dialog: add missing sanity check
---
src/interface/dialog.c | 6 +++++-
......
From 380288ff813d298891b2120238aced41b249c45d Mon Sep 17 00:00:00 2001
From f168be843a12ec88568178ba5b68459be764f605 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/20] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/19] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 1f9c2287ed35c3561f77a935546ec4695646f7ef Mon Sep 17 00:00:00 2001
From 5ca13f0ca73e302a91248bb61f555a18bb67b838 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 05/20] lib/media player: inherit deinterlace variable to
Subject: [PATCH 04/19] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -9,10 +9,10 @@ Subject: [PATCH 05/20] 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 d862926..eabbbf6 100644
index 2dee2d7..3ff4b8a 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -598,7 +598,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -610,7 +610,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 8fb7fd1a7ae46e83d2c4fe1f507f80a96fca877a 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 04/20] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
modules/codec/libass.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 3d08717..7d90c1c 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -29,6 +29,13 @@
# include "config.h"
#endif
+#if defined (__APPLE__)
+#include <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+#endif
+
#include <string.h>
#include <limits.h>
#include <assert.h>
@@ -213,6 +220,37 @@ static int Create( vlc_object_t *p_this )
#if defined( __ANDROID__ )
const char *psz_font = "/system/fonts/DroidSans-Bold.ttf";
const char *psz_family = "Droid Sans Bold";
+#elif defined (__APPLE__)
+#if !TARGET_OS_IPHONE
+ const char *psz_font = NULL; /* We don't ship a default font with VLC */
+ const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
+#else
+ CFURLRef fileURL;
+ fileURL = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("OpenSans-Regular.ttf"),
+ NULL,
+ NULL);
+ if (!fileURL)
+ return VLC_EGENERIC;
+
+ CFStringRef urlString = CFURLCopyFileSystemPath(fileURL, kCFURLPOSIXPathStyle);
+ CFRelease(fileURL);
+
+ if (!urlString)
+ return VLC_EGENERIC;
+
+ CFIndex length = CFStringGetLength(urlString);
+ if (!length)
+ return VLC_EGENERIC;
+ length++;
+
+ char *psz_path = (char *)malloc(length);
+ CFStringGetCString(urlString, psz_path, length, kCFStringEncodingUTF8);
+ CFRelease(urlString);
+
+ const char *psz_font = (const char *)strdup(psz_path);
+ free(psz_path);
+ const char *psz_family = "Open Sans";
+#endif
#else
const char *psz_font = NULL; /* We don't ship a default font with VLC */
const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
--
2.6.0
From 7de51518bbeb46f036cb5462ae610cb800d22bc5 Mon Sep 17 00:00:00 2001
From 27d09b9a6654d7acecc52294e387a4f5a6192c7c 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 06/20] arm_neon: work-around libtool issue
Subject: [PATCH 05/19] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 673566ac24c63824d80bf8f276d83887aa6ece03 Mon Sep 17 00:00:00 2001
From 7728ca5c568be20e5b2f5f097ad51f891215eaac 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 07/20] libvlc/media: re-parse if flags changed
Subject: [PATCH 06/19] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
......
From fc0c207634674ad79db46c058eef4d1a63201319 Mon Sep 17 00:00:00 2001
From 48f2bcf02f918c7f9d3282d6f426d3dbe73a38f7 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/20] arm_neon: fix iOS linking
Subject: [PATCH 07/19] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 2629a5884357946600fef2f548c5223711cdd492 Mon Sep 17 00:00:00 2001
From 3686622b1911f6e31c9a82ab3312ce3dd1d97bf6 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 09/20] disable neon volume plugin
Subject: [PATCH 08/19] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From d42447c80a9af414362cbfda52693d92659fe0e2 Mon Sep 17 00:00:00 2001
From 247206a891554f30673870c3ddb76797762b858d 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 10/20] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 09/19] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 10/20] contrib/gcrypt: work-around a libtool limitation
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index d817a13..5000488 100644
index 2fed2cd..0471522 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......
From ff44a55675dc46305ebf8c1e1899a9c87c1cd418 Mon Sep 17 00:00:00 2001
From af2d272b6b2c40b55bc30518f8aea8569ffcd280 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 11/20] src/misc: fix compilation for OS without fork()
Subject: [PATCH 10/19] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
......
From 58fc8220e8dd9aa5bc3ed2246e231e1b4570603f Mon Sep 17 00:00:00 2001
From 8a77ad7233ce8b5d4493ae7997f26df665c38e2a 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 12/20] libvlc: hack to disable daemon mode
Subject: [PATCH 11/19] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......
From ffc4ae8107acf6d580388dc80b204f42b57fd26b Mon Sep 17 00:00:00 2001
From 99727e9053a815919704699e4756dbad9b2e9bf2 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 13/20] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 12/19] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,7 +32,7 @@ index 0000000..f1d3ccc
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 5000488..6de232b 100644
index 0471522..ac20d02 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -16,6 +16,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......
From 40a0bcc2353a98ade119ac90f0bbf48c0b50edd1 Mon Sep 17 00:00:00 2001
From eb0d9857947deef28cee80e8b3bddcd522c0aaae 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 14/20] disable videotoolbox
Subject: [PATCH 13/19] disable videotoolbox
---
extras/package/ios/build.sh | 2 ++
......
From e68ec9522665105fd05c366fa9de39cd91b4ecd7 Mon Sep 17 00:00:00 2001
From b92a7eb4730633b9a39a7079c176749f4b34da7d 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 15/20] Revert "libvlc: refactor sfilter enabling/disabling"
Subject: [PATCH 14/19] Revert "libvlc: refactor sfilter enabling/disabling"
This reverts commit 93900cd71aff74d4eec617d8f87be97427f83101.
---
......
From 099b9ae270a0242c2f9402723a6f3b9952a6e7be Mon Sep 17 00:00:00 2001
From 4782cb6028f64999615ec26a5a4a194b9de7bb5b 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 16/20] libvlc: expose a base set of freetype options to
Subject: [PATCH 15/19] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -75,10 +75,10 @@ index 49207db..88d2478 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index eabbbf6..41a3773 100644
index 3ff4b8a..dca0ffc 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -628,6 +628,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -640,6 +640,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);
......@@ -188,10 +188,10 @@ index 167f76a..5a2b1ac 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 040a691..6747781 100644
index 3409460..f4f2f00 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -78,6 +78,9 @@
@@ -77,6 +77,9 @@
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
......@@ -201,7 +201,7 @@ index 040a691..6747781 100644
#define FONT_TEXT N_("Font")
#define MONOSPACE_FONT_TEXT N_("Monospace Font")
@@ -930,12 +933,14 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -929,12 +932,14 @@ static void FillDefaultStyles( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
......@@ -217,7 +217,7 @@ index 040a691..6747781 100644
p_sys->p_default_style->i_outline_alpha = var_InheritInteger( p_filter, "freetype-outline-opacity" );
p_sys->p_default_style->i_outline_alpha = VLC_CLIP( p_sys->p_default_style->i_outline_alpha, 0, 255 );
p_sys->p_default_style->i_outline_color = var_InheritInteger( p_filter, "freetype-outline-color" );
@@ -951,11 +956,11 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -950,11 +955,11 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_features |= STYLE_HAS_FLAGS;
p_sys->p_forced_style->i_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
......@@ -231,7 +231,7 @@ index 040a691..6747781 100644
{
p_sys->p_forced_style->i_style_flags |= STYLE_BOLD;
p_sys->p_forced_style->i_features |= STYLE_HAS_FLAGS;
@@ -963,6 +968,12 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -962,6 +967,12 @@ static void FillDefaultStyles( filter_t *p_filter )
/* Apply forced styles to defaults, if any */
text_style_Merge( p_sys->p_default_style, p_sys->p_forced_style, true );
......@@ -244,25 +244,25 @@ index 040a691..6747781 100644
}
static void FreeStylesArray( text_style_t **pp_styles, size_t i_styles )
@@ -1334,6 +1345,17 @@ static void Destroy( vlc_object_t *p_this )
@@ -1324,6 +1335,17 @@ static void Destroy( vlc_object_t *p_this )
DumpDictionary( p_filter, &p_sys->fallback_map, true, -1 );
#endif
+ var_DelCallback( p_filter, "freetype-font", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-fontsize", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-rel-fontsize", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-color", DefaultFontStyleCallback, p_sys );
+ var_DelCallback( p_filter, "freetype-bold", DefaultFontStyleCallback, p_sys );
+ vlc_mutex_destroy( &p_sys->lock );
+
+ var_Destroy( p_filter, "freetype-font" ) ;
+ var_Destroy( p_filter, "freetype-fontsize" );
+ var_Destroy( p_filter, "freetype-rel-fontsize" );
+ var_Destroy( p_filter, "freetype-color" );
+ var_Destroy( p_filter, "freetype-bold" );
+
/* Attachments */
if( p_sys->pp_font_attachments )
{
@@ -1363,3 +1385,33 @@ static void Destroy( vlc_object_t *p_this )
@@ -1353,3 +1375,33 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys );
}
......
From 457f9192e4179a2c9c3b54f77280b1ab025a85fc Mon Sep 17 00:00:00 2001
From ecf3e6ac72677c50a43d841f9cfb330fed41f040 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 17/20] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 16/19] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......
From d972a9cdc466d4e0dfbfcb4883499ab8a44c6d7b Mon Sep 17 00:00:00 2001
From 730eefed8be9bc079070ff4795789a712c8ee0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 20 Nov 2015 13:27:09 +0100
Subject: [PATCH 18/20] contrib/lua: add tvOS support
Subject: [PATCH 17/19] contrib/lua: add tvOS support
---
contrib/src/lua/lua-tvos-support.patch | 26 ++++++++++++++++++++++++++
......
From 2fe500f6df1bb8b105ac72987daef6f9d7b82419 Mon Sep 17 00:00:00 2001
From abb61b0dc11a5465cbe9da481d287bd844da1602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 20 Nov 2015 14:46:23 +0100
Subject: [PATCH 19/20] Enable lua for tvOS
Subject: [PATCH 18/19] Enable lua for tvOS
---
extras/package/ios/build.sh | 10 ++++------
......
From 664bd9b276febf357bfe51d2aa837caacac13ae5 Mon Sep 17 00:00:00 2001
From a1d303613cb3942fbb47a5f76e1447819072196e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 20 Nov 2015 14:45:50 +0100
Subject: [PATCH 20/20] configure: don't fail if there is no lua compiler, just
Subject: [PATCH 19/19] configure: don't fail if there is no lua compiler, just
don't compile lua
---
......
......@@ -16,7 +16,7 @@ SKIPLIBVLCCOMPILATION=no
SCARY=yes
TVOS=no
TESTEDHASH=217a2f8c
TESTEDHASH=138e3534
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