Skip to content
Snippets Groups Projects
Commit fb90d0e1 authored by Thomas Guillem's avatar Thomas Guillem Committed by Geoffrey Métais
Browse files

libvlc: make VLC patches not mandatory


Make compilation work even if we don't apply recording patches.

Signed-off-by: default avatarRomain Vimont <rom1v@videolabs.io>
parent 32e12f81
No related branches found
No related tags found
No related merge requests found
......@@ -47,7 +47,9 @@ static const libvlc_event_type_t mp_events[] = {
libvlc_MediaPlayerSeekableChanged,
libvlc_MediaPlayerPausableChanged,
libvlc_MediaPlayerLengthChanged,
#ifdef LIBVLC_MEDIA_PLAYER_HAS_RECORDING
libvlc_MediaPlayerRecordChanged,
#endif
-1,
};
......@@ -110,10 +112,12 @@ MediaPlayer_event_cb(vlcjni_object *p_obj, const libvlc_event_t *p_ev,
case libvlc_MediaPlayerLengthChanged:
p_java_event->arg1 = p_ev->u.media_player_length_changed.new_length;
break;
#ifdef LIBVLC_MEDIA_PLAYER_HAS_RECORDING
case libvlc_MediaPlayerRecordChanged:
p_java_event->arg1 = p_ev->u.media_player_record_changed.recording;
p_java_event->argc1 = p_ev->u.media_player_record_changed.file_path;
break;
#endif
}
p_java_event->type = p_ev->type;
return true;
......
From 582275c70b3441d1b8e8eaf6a196c719254efdfe Mon Sep 17 00:00:00 2001
From 2e675c6533bdf0a12c68e7673736c24613809665 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 13 Apr 2018 16:15:16 +0200
Subject: [PATCH] access: add smb2 module
Subject: [PATCH 1/6] access: add smb2 module
Using libsmb2 from Ronnie Sahlberg https://github.com/sahlberg/libsmb2
This is LGPL 2.1 fully async lib for accessing SMB2 and SMB3 shares.
......@@ -471,7 +471,7 @@ index 765ceec45f..2a773029e3 100644
access_LTLIBRARIES += libtcp_plugin.la
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
new file mode 100644
index 0000000000..90cd0d327f
index 0000000000..9c9529385b
--- /dev/null
+++ b/modules/access/smb2.c
@@ -0,0 +1,717 @@
......
From a9bf3d0db32407b7320269e33a4864e2977badaf Mon Sep 17 00:00:00 2001
From 62e61c44f3c7a35a39e718c85f06531c5a1f928f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 28 Mar 2019 15:23:48 +0100
Subject: [PATCH 1/2] compat: Workaround sendmsg bug on android
Subject: [PATCH 2/6] compat: Workaround sendmsg bug on android
This only happens on 64bits builds, see compat/sendmsg.c comments
---
......@@ -46,7 +46,7 @@ index 0f42e782f8..8d69048746 100644
#else
#error sendmsg not implemented on your platform!
diff --git a/configure.ac b/configure.ac
index 49b1166742..6f1edd73a3 100644
index 7bcdb44c9b..1ad82e2d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,9 @@ AS_IF([test "$SYS" = linux],[
......
From c4b67a2d0823729d0057155f828a7624d36059c9 Mon Sep 17 00:00:00 2001
From e8992a5bbc20101445819ad92d39bd97f1290da8 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 3/4] libvlc: events: Add callbacks for record
Subject: [PATCH 3/6] libvlc: events: Add callbacks for record
---
include/vlc/libvlc_events.h | 9 +++++++++
......@@ -43,7 +43,7 @@ index f8b0e9b5b2..bbc6bc0eec 100644
{
libvlc_renderer_item_t *item;
diff --git a/lib/media_player.c b/lib/media_player.c
index 354272b32d..e337cf7197 100644
index a9a22fee15..ad8d2a80cc 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -446,6 +446,22 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd,
......
From 22f9fa0c66b78096af08a8f51869bbb24a3768e4 Mon Sep 17 00:00:00 2001
From 21ad8184f794553b923a15c7ebc7215f5b9ea502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Mar 2019 10:56:26 +0100
Subject: [PATCH 2/2] network: tls: Handle errors from older kernels
Subject: [PATCH 4/6] network: tls: Handle errors from older kernels
If MSG_FASTOPEN is defined, but turns out to be unimplemented by the
underlying kernel (as is the case on android where the NDK claims to
......
From 88ddce79a49dc6b88033844d36666848ce1a8365 Mon Sep 17 00:00:00 2001
From fba208edd903f9e1486cb9470f863924a174b258 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 4/4] access_output: file: Add error dialog for write/open
Subject: [PATCH 5/6] access_output: file: Add error dialog for write/open
---
modules/access_output/file.c | 8 ++++++++
......
From a16ca81ddc53c2275f6946ceb979f28b50bfb069 Mon Sep 17 00:00:00 2001
From 081d6e7ec842c07d3edd16ecdb65ed17fcd3a856 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 2/4] libvlc: media_player: Add record method
Subject: [PATCH 6/6] libvlc: media_player: Add record method
---
include/vlc/libvlc_media_player.h | 11 +++++++++++
include/vlc/libvlc_media_player.h | 13 +++++++++++++
lib/media_player.c | 19 +++++++++++++++++++
2 files changed, 30 insertions(+)
2 files changed, 32 insertions(+)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index c431c235e9..8629fbc1a1 100644
index c431c235e9..bc0d1f774c 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -2079,6 +2079,17 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
@@ -26,6 +26,8 @@
#ifndef VLC_LIBVLC_MEDIA_PLAYER_H
#define VLC_LIBVLC_MEDIA_PLAYER_H 1
+#define LIBVLC_MEDIA_PLAYER_HAS_RECORDING
+
# ifdef __cplusplus
extern "C" {
# else
@@ -2079,6 +2081,17 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
*/
LIBVLC_API int libvlc_media_player_set_role(libvlc_media_player_t *p_mi,
unsigned role);
......@@ -31,10 +40,10 @@ index c431c235e9..8629fbc1a1 100644
/** @} audio */
diff --git a/lib/media_player.c b/lib/media_player.c
index a9a22fee15..354272b32d 100644
index ad8d2a80cc..e337cf7197 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -621,6 +621,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -637,6 +637,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
var_Create (mp, "sout", VLC_VAR_STRING);
var_Create (mp, "demux-filter", VLC_VAR_STRING);
......@@ -42,7 +51,7 @@ index a9a22fee15..354272b32d 100644
/* Video */
var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
@@ -2078,3 +2079,21 @@ int libvlc_media_player_get_role(libvlc_media_player_t *mp)
@@ -2094,3 +2095,21 @@ int libvlc_media_player_get_role(libvlc_media_player_t *mp)
free(str);
return ret;
}
......
From 06d50c42ed4a2a03826ef0d311c2f0659af43e4e Mon Sep 17 00:00:00 2001
From de351093bd7df450c3790ec08290ad0927b00236 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 5/5] libvlc: media_player: Add record method
---
include/vlc/libvlc_media_player.h | 12 ++++++++++++
include/vlc/libvlc_media_player.h | 14 ++++++++++++++
lib/media_player.c | 19 +++++++++++++++++++
2 files changed, 31 insertions(+)
2 files changed, 33 insertions(+)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 0df3c0bcc7..0ce69257d7 100644
index 0df3c0bcc7..4e5bb918cb 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -2416,6 +2416,18 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
@@ -25,6 +25,8 @@
#ifndef VLC_LIBVLC_MEDIA_PLAYER_H
#define VLC_LIBVLC_MEDIA_PLAYER_H 1
+#define LIBVLC_MEDIA_PLAYER_HAS_RECORDING
+
# ifdef __cplusplus
extern "C" {
# else
@@ -2416,6 +2418,18 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
LIBVLC_API int libvlc_media_player_set_role(libvlc_media_player_t *p_mi,
unsigned role);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment