Commit 10c42f55 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

MVK: update libvlc

parent 5ac83b2e
From 3a46a99d4e2cb4846bb8f9320ae63aaf7bbd038d Mon Sep 17 00:00:00 2001
From fc1067c623ec972c7877b8dbbe04bb230f3f3293 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/22] arm_neon: added function macro to handle the underscore
......
From 262dd1814661205767f5045c1ce19fa50bbbeb1e Mon Sep 17 00:00:00 2001
From f635ebee207353481c224d20e016994330a33105 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/22] deinterlace/merge: use a macro to fix compilation for
......
From 6d98276cf32f2407525ca310f10f74ef5cd975ab Mon Sep 17 00:00:00 2001
From 9f83a47ea417de4409499f7d56e7609f35139efb 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/22] lib/media player: inherit deinterlace variable to
......
From 60b9e034eebaf638e011798a5b092b3ee0aac0f7 Mon Sep 17 00:00:00 2001
From c1382d874e3622df136e6a008d3920730fe754a8 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/22] arm_neon: work-around libtool issue
......
From 0c3ec4c963c94516326c8b853b4089acf297b8fa Mon Sep 17 00:00:00 2001
From d8f2aac3c9ccdd60fd20f54d0833954be7c00c5f 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/22] arm_neon: fix iOS linking
......
From 4319d10b0f47b908286cf85326c6a96ed0fde5a5 Mon Sep 17 00:00:00 2001
From cfd9874858c34a0d1426eed5f8789269863a2e60 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/22] disable neon volume plugin
......
From 0ec727b72a1ead2e47d864711c494d2478a27b61 Mon Sep 17 00:00:00 2001
From 51c8f0bf8899aac4532ad89c1c19bba7835c4894 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/22] src/misc: fix compilation for OS without fork()
......
From ee7b6789d81b9f9aff7b6769983316eb36f5e157 Mon Sep 17 00:00:00 2001
From 8c335f6a6ddfd0584c8dc804e03b37011b45fb10 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/22] libvlc: hack to disable daemon mode
......
From 31a1240a7c78cf1ec7e0e06109f3bdd0ca07d2d1 Mon Sep 17 00:00:00 2001
From 8fa1ef9dbb9a27617e59de4b13cabe30b2c53ebe 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/22] libvlc: expose a base set of freetype options to
......
From c1119862c21ecb533ecd9d179572ba877dde1f16 Mon Sep 17 00:00:00 2001
From 7ba81810fbb333efb1644921e7f8797936eefcb6 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/22] libvlc: create VT-zero-copy variable
......
From 39d78601282d534a5d07e0f8492e9473601f84af Mon Sep 17 00:00:00 2001
From 72f9f62f6c3dd2d113234da647a561e3e28080bc 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/22] contrib/gcrypt: work-around a libtool limitation
......
From e40db64896fadb3c3b6e11f6b7617a5ea5519521 Mon Sep 17 00:00:00 2001
From 4b7193dc3733a7aaecbde2f0321992600edbebec 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/22] contrib/gcrypt: fix tvOS compilation
......
From d3f8f05a501733ce8e4f6b8610226f53095e7423 Mon Sep 17 00:00:00 2001
From 06e9b29cd099676065eed2e582c49b46a758a0fc 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/22] contrib/avcodec: enforce use of FFmpeg
......
From 67a706681de7d6099f943d73452313b5de8701b4 Mon Sep 17 00:00:00 2001
From 2ea66aba3d4a7be74b093ba6bb9a970939aeb45f 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/22] Enable System DL
......
From 001563c3b663f496dc9d8acb222a01f975ee6263 Mon Sep 17 00:00:00 2001
From 52471fa7a441d46a7b49ec0bd7961cf52ffa98dc 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/22] Add AC-3 pass-through
......
From 41960674564c252876708e807f78e5de99c00dba Mon Sep 17 00:00:00 2001
From abf868b5a10c854ab1b850649b9a3e9843c78243 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/22] taglib: DO NOT PUSH: works with networks accesses
......
From ddff4cfb3997c104a2bf95ddbba75c2c94e747ec Mon Sep 17 00:00:00 2001
From 6d54b0ec683af255f8b4b302613d39e78a072060 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/22] contrib/gcrypt: update patches
......
From 21299085e84aba831309baef5ef7fba353c98cc8 Mon Sep 17 00:00:00 2001
From 0e15b5e37fd75aac9bc1c2d8106c1f7e9499446f 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/22] deinterlace-merge-arm64: fix linking on appleOS
......
From 32bf595d53a48e131f4d390d5b3eea5dca23f306 Mon Sep 17 00:00:00 2001
From 9d63c46d361e3d19cd5a0b74805b1a4a3da4c00b Mon Sep 17 00:00:00 2001
From: Adrien Maglo <magsoft@videolan.org>
Date: Fri, 16 Sep 2016 14:00:21 +0200
Subject: [PATCH 19/22] ios2 vout: add subpicture rendering in the zero copy
......@@ -9,7 +9,7 @@ Subject: [PATCH 19/22] ios2 vout: add subpicture rendering in the zero copy
1 file changed, 304 insertions(+), 34 deletions(-)
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 8fa4bc6..9362fc1 100644
index 797c615..6ca5caf 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -46,6 +46,7 @@
......@@ -297,7 +297,7 @@ index 8fa4bc6..9362fc1 100644
}
static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
@@ -970,6 +1171,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
@@ -976,6 +1177,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
......@@ -306,7 +306,7 @@ index 8fa4bc6..9362fc1 100644
glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffer);
[_eaglContext presentRenderbuffer:GL_RENDERBUFFER];
@@ -980,6 +1183,54 @@ done:
@@ -986,6 +1189,54 @@ done:
[EAGLContext setCurrentContext:previousContext];
}
......@@ -361,7 +361,7 @@ index 8fa4bc6..9362fc1 100644
- (void)setupZeroCopyGL
{
EAGLContext *previousContext = [EAGLContext currentContext];
@@ -1026,55 +1277,59 @@ done:
@@ -1032,55 +1283,59 @@ done:
- (BOOL)loadShaders
{
......@@ -440,7 +440,7 @@ index 8fa4bc6..9362fc1 100644
}
// Get uniform locations.
@@ -1084,16 +1339,35 @@ done:
@@ -1090,16 +1345,35 @@ done:
uniforms[UNIFORM_TRANSFORM_MATRIX] = glGetUniformLocation(self.shaderProgram, "transformMatrix");
// Release vertex and fragment shaders.
......@@ -483,7 +483,7 @@ index 8fa4bc6..9362fc1 100644
}
- (BOOL)compileShader:(GLuint *)shader type:(GLenum)type sourceString:sourceString
@@ -1106,7 +1380,6 @@ done:
@@ -1112,7 +1386,6 @@ done:
glShaderSource(*shader, 1, &source, NULL);
glCompileShader(*shader);
......@@ -491,7 +491,7 @@ index 8fa4bc6..9362fc1 100644
GLint logLength;
glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0) {
@@ -1116,7 +1389,6 @@ done:
@@ -1122,7 +1395,6 @@ done:
msg_Dbg(_voutDisplay, "Shader compile log:\n%s", log);
free(log);
}
......@@ -499,7 +499,7 @@ index 8fa4bc6..9362fc1 100644
glGetShaderiv(*shader, GL_COMPILE_STATUS, &status);
if (status == 0) {
@@ -1132,7 +1404,6 @@ done:
@@ -1138,7 +1410,6 @@ done:
GLint status;
glLinkProgram(prog);
......@@ -507,7 +507,7 @@ index 8fa4bc6..9362fc1 100644
GLint logLength;
glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0) {
@@ -1142,7 +1413,6 @@ done:
@@ -1148,7 +1419,6 @@ done:
msg_Dbg(_voutDisplay, "Program link log:\n%s", log);
free(log);
}
......
From c4143310b296c998d8af41b5193deb9eac9abf79 Mon Sep 17 00:00:00 2001
From ffda41d419cf039b96c7f3d83f2da9601fb72c9a Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 20/22] libvlc_media: add cookie_jar API
......
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