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

MVK: update libvlc

parent ad74123a
From 1a28df4991487ffb803fe7bd28344d1af5bf4244 Mon Sep 17 00:00:00 2001
From 045f95e1f7f184b3a1128272a4905e4da3f1cf11 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/16] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/18] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.9.2
2.9.3
From 5c93d18e3a54258ed14cd1c02cc1bc75f6e9c5fa Mon Sep 17 00:00:00 2001
From ddffd018ab92a2472af73c8614a54ee0aea55ab6 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/16] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/18] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.9.2
2.9.3
From e4c222678a310b6965e36e20ebaaad0e7eb4e17f Mon Sep 17 00:00:00 2001
From 0df1c371030c0d52f0c73728a77f944538f2c007 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/16] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/18] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -22,5 +22,5 @@ index 69d3523..f2e9d03 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.9.2
2.9.3
From cc79f77e422561c7565067761f39e6cdc23ae7b0 Mon Sep 17 00:00:00 2001
From 98e468e52db1a67e51dd0dfa50c52a9f5339ef28 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/16] arm_neon: work-around libtool issue
Subject: [PATCH 04/18] 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.9.2
2.9.3
From 18ac430c24fca742b6b5476a0af9607d89e0ae16 Mon Sep 17 00:00:00 2001
From aad02413132c0c0f6fd8a62c6d2de0449510f02f 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/16] arm_neon: fix iOS linking
Subject: [PATCH 05/18] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.9.2
2.9.3
From 58a317231a3834a3c7492961d56525b4777ac1a6 Mon Sep 17 00:00:00 2001
From 34d77b21a8d145c2d191a88739e3be29d399c999 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/16] disable neon volume plugin
Subject: [PATCH 06/18] 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.9.2
2.9.3
From 0ce24cc168037ac7cf6c2b10146efb742798014d Mon Sep 17 00:00:00 2001
From 96c73dc8a0bb7f78a39f177c024ae9fcb14008a8 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/16] src/misc: fix compilation for OS without fork()
Subject: [PATCH 07/18] 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.9.2
2.9.3
From 731c658532e6e5845e28c01246c4b9fd7021f893 Mon Sep 17 00:00:00 2001
From 34c0318ef16a90b9f21b01fb07db8b455eb7256e 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/16] libvlc: hack to disable daemon mode
Subject: [PATCH 08/18] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......@@ -23,5 +23,5 @@ index 48c2b8c..3c9f879 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.9.2
2.9.3
From 3567ee1605dbe65f6a9fb3b9a3de3aaa4e8a5d0d Mon Sep 17 00:00:00 2001
From ff22f55729255a2e2f91392d0c399c08dbc3602f 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 09/16] libvlc: expose a base set of freetype options to
Subject: [PATCH 09/18] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -14,10 +14,10 @@ Subject: [PATCH 09/16] libvlc: expose a base set of freetype options to
6 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 79a0b1f..3a37d3b 100644
index 2718a33..0e00fa9 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1496,6 +1496,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1487,6 +1487,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 );
......@@ -314,5 +314,5 @@ index 44b2731..7f1abec 100644
/**
--
2.9.2
2.9.3
From ba397b004f27d215c52a9547133159d80d5c9e32 Mon Sep 17 00:00:00 2001
From c576ce81ce688b3791bcb1877a65c2f88e806118 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 10/16] libvlc: create VT-zero-copy variable
Subject: [PATCH 10/18] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......@@ -20,5 +20,5 @@ index 8d54c93..143e240 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.9.2
2.9.3
From c5b868df5f557c2ea8bfe66b490dc69e73b4cd8a Mon Sep 17 00:00:00 2001
From 51007d631b26f98020ba2b2056b4c5c2a9c3552d 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 11/16] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 11/18] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,12 +10,12 @@ Subject: [PATCH 11/16] 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 e528e57..4d2604c 100644
index 291f0fc..1484e7a 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
$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
ifdef HAVE_WINSTORE
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.9.2
2.9.3
From 2ee5623ea8f0d972a13775d8327268614c4d7119 Mon Sep 17 00:00:00 2001
From 060e372ab993b64c20fece40094e698b4290adce 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/16] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 12/18] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,18 +32,18 @@ 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 4d2604c..ee4c969 100644
index 1484e7a..200a98e 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
$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
+ $(APPLY) $(SRC)/gcrypt/fix-sha1-ssse3-for-clang.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
endif
@@ -36,6 +37,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
@@ -42,6 +43,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else
GCRYPT_EXTRA_CFLAGS =
endif
......@@ -56,5 +56,5 @@ index 4d2604c..ee4c969 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.9.2
2.9.3
From 6c848318840deac77e59e069a273bccb5ad9d1e2 Mon Sep 17 00:00:00 2001
From fe4b6fefeef168d5c1881379aed9d8ff36be2f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 13/16] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 13/18] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 6604a76..607b781 100644
index e4178c6..4dba6f8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -25,5 +25,5 @@ index 6604a76..607b781 100644
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else
--
2.9.2
2.9.3
From b4d0ace729bde6eebb4d73212c60f15a2fbf0aeb Mon Sep 17 00:00:00 2001
From a5f3ea3be888ae5756f4633dbfc57cfd2a106b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 14/16] Enable System DL
Subject: [PATCH 14/18] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......@@ -36,7 +36,7 @@ index 0000000..2d60cf7
+ in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
+ in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 607b781..52cd07e 100644
index 4dba6f8..b4ce531 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -22,6 +22,9 @@ FFMPEGCONF = \
......@@ -49,7 +49,7 @@ index 607b781..52cd07e 100644
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -200,6 +203,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
@@ -216,6 +219,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(FFMPEG_HASH)
mkdir -p $@-$(FFMPEG_HASH)
$(XZCAT) "$<" | (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1)
......@@ -58,5 +58,5 @@ index 607b781..52cd07e 100644
.ffmpeg: ffmpeg
--
2.9.2
2.9.3
From 636f785df8a518cc9a2233f7ed12704e4efd0842 Mon Sep 17 00:00:00 2001
From 18c5badc3e4fb4b50b876da57f86b3962b2f516e Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 15/16] Add AC-3 pass-through
Subject: [PATCH 15/18] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -16,10 +16,10 @@ Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
5 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 8ea32c4..af7933a 100755
index 1528861..66077d5 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -461,8 +461,6 @@ speex_resampler
@@ -460,8 +460,6 @@ speex_resampler
remoteosd
magnify
gradient
......@@ -29,10 +29,10 @@ index 8ea32c4..af7933a 100755
visual
fb
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 3a37d3b..90a27af 100644
index 0e00fa9..e949e32 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1831,6 +1831,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
@@ -1822,6 +1822,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
/**
......@@ -150,5 +150,5 @@ index cee8eab..0aa9dee 100644
/* Set audio session to mediaplayback */
NSError *error = nil;
--
2.9.2
2.9.3
From ad7a603b2b79382fbe59144547e8b2676d1e334c Mon Sep 17 00:00:00 2001
From 95c7630fbc49729a3a89137198b0ad9f928afa7d Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 22 Jul 2016 11:20:24 +0200
Subject: [PATCH 16/16] taglib: DO NOT PUSH: works with networks accesses
Subject: [PATCH 16/18] taglib: DO NOT PUSH: works with networks accesses
---
modules/meta_engine/taglib.cpp | 15 ++++-----------
......@@ -48,5 +48,5 @@ index 4e5df57..cdae73c 100644
if( psz_path == NULL )
return VLC_EGENERIC;
--
2.9.2
2.9.3
From df0ae416574fc7e036996b499948c7346d9cb471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 17/18] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 13 +++++++------
contrib/src/gcrypt/work-around-libtool-limitation.patch | 16 ++++++++--------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
index f1d3ccc..9d946ed 100644
--- a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -1,16 +1,17 @@
diff -ru libgcrypt/cipher/sha1-ssse3-amd64.S libgcrypt/cipher/sha1-ssse3-amd64.S
---- libgcrypt/cipher/sha1-ssse3-amd64.S 2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt/cipher/sha1-ssse3-amd64.S 2015-10-03 22:40:21.000000000 +0200
-@@ -217,10 +217,9 @@
- * _gcry_sha1_transform_amd64_ssse3 (void *ctx, const unsigned char *data)
+--- libgcrypt/cipher/sha1-ssse3-amd64.S 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/cipher/sha1-ssse3-amd64.S 2016-09-12 15:16:55.000000000 +0200
+@@ -227,10 +227,10 @@
+ * size_t nblks)
*/
.text
-.globl _gcry_sha1_transform_amd64_ssse3
--.type _gcry_sha1_transform_amd64_ssse3,@function
+-ELF(.type _gcry_sha1_transform_amd64_ssse3,@function)
+.globl __gcry_sha1_transform_amd64_ssse3
++ELF(.type __gcry_sha1_transform_amd64_ssse3,@function)
.align 16
-_gcry_sha1_transform_amd64_ssse3:
+__gcry_sha1_transform_amd64_ssse3:
/* input:
* %rdi: ctx, CTX
- * %rsi: data (64 bytes)
+ * %rsi: data (64*nblks bytes)
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
index df97ffb..957f268 100644
--- a/contrib/src/gcrypt/work-around-libtool-limitation.patch
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -1,18 +1,18 @@
-diff -ru libgcrypt-broken/cipher/Makefile.am libgcrypt/cipher/Makefile.am
---- libgcrypt-broken/cipher/Makefile.am 2013-11-06 23:05:24.000000000 +0100
-+++ libgcrypt/cipher/Makefile.am 2013-11-06 23:21:25.000000000 +0100
+diff -ru libgcrypt/cipher/Makefile.am libgcrypt/cipher/Makefile.am
+--- libgcrypt/cipher/Makefile.am 2016-08-17 13:21:22.000000000 +0200
++++ libgcrypt/cipher/Makefile.am 2016-09-12 15:13:54.000000000 +0200
@@ -19,6 +19,8 @@
# Process this file with automake to produce Makefile.in
+LIBTOOL=@LIBTOOL@ --tag=CC
+
- EXTRA_DIST = Manifest
-
# Need to include ../src in addition to top_srcdir because gcrypt.h is
-diff -ru libgcrypt-broken/mpi/Makefile.am libgcrypt/mpi/Makefile.am
---- libgcrypt-broken/mpi/Makefile.am 2013-11-06 23:05:24.000000000 +0100
-+++ libgcrypt/mpi/Makefile.am 2013-11-06 23:22:04.000000000 +0100
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+diff -ru libgcrypt/mpi/Makefile.am libgcrypt-fixed/mpi/Makefile.am
+--- libgcrypt/mpi/Makefile.am 2016-03-23 12:59:34.000000000 +0100
++++ libgcrypt/mpi/Makefile.am 2016-09-12 15:13:28.000000000 +0200
@@ -23,6 +23,9 @@
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.9.3
From 648dae663d74c71bdbb8c2d9e31185f81dd672a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:04:05 +0200
Subject: [PATCH 18/18] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
modules/video_filter/deinterlace/merge_arm64.S | 14 ++++----
2 files changed, 52 insertions(+), 8 deletions(-)
create mode 100644 modules/arm_neon/asm64.S
diff --git a/modules/arm_neon/asm64.S b/modules/arm_neon/asm64.S
new file mode 100644
index 0000000..d778163
--- /dev/null
+++ b/modules/arm_neon/asm64.S
@@ -0,0 +1,46 @@
+ //*****************************************************************************
+ // asm.S : defines and macros
+ //*****************************************************************************
+ // Copyright (C) 2012 David Geldreich <david.geldreich at free.fr>
+ // Copyright (C) 2016 Felix Paul Kühne <fkuehne at videolan.org>
+ //
+ // 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
+ // the Free Software Foundation; either version 2.1 of the License, or
+ // (at your option) any later version.
+ //
+ // This program is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU Lesser General Public License for more details.
+ //
+ // You should have received a copy of the GNU Lesser General Public License
+ // along with this program; if not, write to the Free Software Foundation,
+ // Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ //****************************************************************************/
+
+#ifdef __APPLE__
+# define EXTERN_ASM _
+#else
+# define EXTERN_ASM
+#endif
+
+# define ELF
+
+.macro function name, export=0
+ .macro endfunc
+ .size \name, . - \name
+ .endfunc
+ .purgem endfunc
+ .endm
+ .text
+ .align 2
+ .if \export
+ .global EXTERN_ASM\name
+EXTERN_ASM\name:
+ .endif
+ .type \name, %function
+ .func \name
+\name:
+.endm
+
diff --git a/modules/video_filter/deinterlace/merge_arm64.S b/modules/video_filter/deinterlace/merge_arm64.S
index ad898a3..27b662d 100644
--- a/modules/video_filter/deinterlace/merge_arm64.S
+++ b/modules/video_filter/deinterlace/merge_arm64.S
@@ -19,6 +19,8 @@
// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
//****************************************************************************/
+#include "../../arm_neon/asm64.S"
+
.text
#define DEST x0
@@ -26,11 +28,8 @@
#define SRC2 x2
#define SIZE x3
- .align 2
- .global merge8_arm64_neon
- .type merge8_arm64_neon, %function
// NOTE: Offset and pitch must be multiple of 16-bytes in VLC.
-merge8_arm64_neon:
+function merge8_arm64_neon, export=1
ands x5, SIZE, #~63
b.eq 2f
mov x10, #64
@@ -65,11 +64,9 @@ merge8_arm64_neon:
st1 {v0.16b}, [DEST]
4:
ret
+endfunc
- .align 2
- .global merge16_arm64_neon
- .type merge16_arm64_neon, %function
-merge16_arm64_neon:
+function merge16_arm64_neon, export=1
ands x5, SIZE, #~63
b.eq 2f
1:
@@ -100,3 +97,4 @@ merge16_arm64_neon:
st1 {v0.8h}, [DEST]
4:
ret
+endfunc
--
2.9.3
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=c79bc234
TESTEDHASH=d75d21fe
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