[vlc-commits] fix AX_APPEND_FLAG missing on some systems

2020-04-02 Thread Steve Lhomme 
npapi-vlc | branch: 3.0.x | Steve Lhomme  | Thu Apr  2 
16:22:56 2020 +0200| [944ea27b92c2efb6d408e1add8909bc08222ffb7] | committer: 
Steve Lhomme

fix AX_APPEND_FLAG missing on some systems

> https://code.videolan.org/videolan/npapi-vlc/commit/944ea27b92c2efb6d408e1add8909bc08222ffb7
---

 m4/ax_append_flag.m4 | 72 
 1 file changed, 72 insertions(+)

diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4
new file mode 100644
index 000..7d3f840
--- /dev/null
+++ b/m4/ax_append_flag.m4
@@ -0,0 +1,72 @@
+# ===
+#  https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim 
+#   Copyright (c) 2011 Maarten Bosmans 
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 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 General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see .
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AC_DEFUN([AX_APPEND_FLAG],
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+[*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+[
+ AS_VAR_APPEND(FLAGS,[" $1"])
+ AC_RUN_LOG([: FLAGS="$FLAGS"])
+])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG
+

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/npapi-vlc][3.0.x] fix AX_APPEND_FLAG missing on some systems

2020-04-02 Thread Steve Lhomme 


Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC Browser Plugins


Commits:
944ea27b by Steve Lhomme at 2020-04-02T16:22:56+02:00
fix AX_APPEND_FLAG missing on some systems

- - - - -


1 changed file:

- + m4/ax_append_flag.m4


Changes:

=
m4/ax_append_flag.m4
=
@@ -0,0 +1,72 @@
+# ===
+#  https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim 
+#   Copyright (c) 2011 Maarten Bosmans 
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 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 General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see .
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AC_DEFUN([AX_APPEND_FLAG],
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+[*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+[
+ AS_VAR_APPEND(FLAGS,[" $1"])
+ AC_RUN_LOG([: FLAGS="$FLAGS"])
+])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG
+



View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/944ea27b92c2efb6d408e1add8909bc08222ffb7

-- 
View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/944ea27b92c2efb6d408e1add8909bc08222ffb7
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] access: dvdnav: check return for nav packets getters

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
19:33:17 2020 +0200| [62a55b6aa6f7d41a815d33928f5ae6ecca9b40b9] | committer: 
Francois Cartegnie

access: dvdnav: check return for nav packets getters

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62a55b6aa6f7d41a815d33928f5ae6ecca9b40b9
---

 modules/access/dvdnav.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 2b8e8e59db..f082f1021b 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1080,10 +1080,16 @@ static int Demux( demux_t *p_demux )
 p_sys->i_vobu_flush = 0;
 
 /* Look if we have need to force a flush (and when) */
-const pci_gi_t *p_pci_gi = &dvdnav_get_current_nav_pci( p_sys->dvdnav 
)->pci_gi;
+const pci_t *p_pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+if( unlikely(!p_pci) )
+break;
+const pci_gi_t *p_pci_gi = &p_pci->pci_gi;
 if( p_pci_gi->vobu_se_e_ptm != 0 && p_pci_gi->vobu_se_e_ptm < 
p_pci_gi->vobu_e_ptm )
 {
-const dsi_gi_t *p_dsi_gi = &dvdnav_get_current_nav_dsi( 
p_sys->dvdnav )->dsi_gi;
+const dsi_t *p_dsi = dvdnav_get_current_nav_dsi( p_sys->dvdnav );
+if( unlikely(!p_dsi) )
+break;
+const dsi_gi_t *p_dsi_gi = &p_dsi->dsi_gi;
 if( p_dsi_gi->vobu_3rdref_ea != 0 )
 p_sys->i_vobu_flush = p_dsi_gi->vobu_3rdref_ea;
 else if( p_dsi_gi->vobu_2ndref_ea != 0 )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] threads: generic one-time initializer

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Feb 24 
21:31:37 2020 +0200| [07f65e3381414ebbf83f92c0602b30d411dbc56b] | committer: 
Rémi Denis-Courmont

threads: generic one-time initializer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07f65e3381414ebbf83f92c0602b30d411dbc56b
---

 include/vlc_threads.h | 20 
 src/misc/threads.c| 40 
 2 files changed, 60 insertions(+)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 131e319622..b04a3305c1 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -633,6 +633,25 @@ VLC_API void vlc_rwlock_unlock(vlc_rwlock_t *);
 
 /** @} */
 
+#ifndef __cplusplus
+#if 0
+/**
+ * One-time initialization.
+ *
+ * A one-time initialization object must always be initialized assigned to
+ * \ref VLC_STATIC_ONCE before use.
+ */
+typedef struct
+{
+atomic_uint value;
+} vlc_once_t;
+
+/**
+ * Static initializer for one-time initialization.
+ */
+#define VLC_STATIC_ONCE { ATOMIC_VAR_INIT(0) }
+#endif
+
 /**
  * Executes a function one time.
  *
@@ -650,6 +669,7 @@ VLC_API void vlc_rwlock_unlock(vlc_rwlock_t *);
  * \param cb callback to execute (the first time)
  */
 VLC_API void vlc_once(vlc_once_t *restrict once, void (*cb)(void));
+#endif
 
 /**
  * \defgroup threadvar Thread-specific variables
diff --git a/src/misc/threads.c b/src/misc/threads.c
index b1eb9888f2..11c46fa730 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -533,3 +533,43 @@ int vlc_sem_timedwait(vlc_sem_t *sem, vlc_tick_t deadline)
 
 return 0;
 }
+
+#if 0
+enum { VLC_ONCE_UNDONE, VLC_ONCE_DOING, VLC_ONCE_CONTEND, VLC_ONCE_DONE };
+
+void vlc_once(vlc_once_t *restrict once, void (*cb)(void))
+{
+unsigned int value = VLC_ONCE_UNDONE;
+
+if (atomic_compare_exchange_strong_explicit(&once->value, &value,
+VLC_ONCE_DOING,
+memory_order_acquire,
+memory_order_acquire)) {
+/* First time: run the callback */
+cb();
+
+if (atomic_exchange_explicit(&once->value, VLC_ONCE_DONE,
+ memory_order_release) == VLC_ONCE_CONTEND)
+/* Notify waiters if any */
+vlc_atomic_notify_all(&once->value);
+
+return;
+}
+
+assert(value >= VLC_ONCE_DOING);
+
+if (unlikely(value == VLC_ONCE_DOING)
+ && atomic_compare_exchange_strong_explicit(&once->value, &value,
+VLC_ONCE_CONTEND,
+memory_order_acquire,
+memory_order_acquire))
+value = VLC_ONCE_CONTEND;
+
+assert(value >= VLC_ONCE_CONTEND);
+
+while (unlikely(value != VLC_ONCE_DONE)) {
+vlc_atomic_wait(&once->value, VLC_ONCE_CONTEND);
+value = atomic_load_explicit(&once->value, memory_order_acquire);
+}
+}
+#endif

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] thread: optimize the one-time initializer

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Feb 24 
21:50:12 2020 +0200| [d76fb9cf3980e305c06777dbbdbbdc11b54d84a5] | committer: 
Rémi Denis-Courmont

thread: optimize the one-time initializer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d76fb9cf3980e305c06777dbbdbbdc11b54d84a5
---

 include/vlc_threads.h | 8 
 src/misc/threads.c| 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 87d0691402..657d53ab4e 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -642,6 +642,14 @@ typedef struct
  * \param cb callback to execute (the first time)
  */
 VLC_API void vlc_once(vlc_once_t *restrict once, void (*cb)(void));
+
+static inline void vlc_once_inline(vlc_once_t *restrict once, void (*cb)(void))
+{
+/* Fast path: check if already initialized */
+if (unlikely(atomic_load_explicit(&once->value, memory_order_acquire) < 3))
+vlc_once(once, cb);
+}
+#define vlc_once(once, cb) vlc_once_inline(once, cb)
 #endif
 
 /**
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 945b9568f6..e26a98f7cd 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -536,7 +536,9 @@ int vlc_sem_timedwait(vlc_sem_t *sem, vlc_tick_t deadline)
 
 enum { VLC_ONCE_UNDONE, VLC_ONCE_DOING, VLC_ONCE_CONTEND, VLC_ONCE_DONE };
 
-void vlc_once(vlc_once_t *restrict once, void (*cb)(void))
+static_assert (VLC_ONCE_DONE == 3, "Check vlc_once in header file");
+
+void (vlc_once)(vlc_once_t *restrict once, void (*cb)(void))
 {
 unsigned int value = VLC_ONCE_UNDONE;
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] thread: use the generic one-time initializer

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Feb 24 
21:50:04 2020 +0200| [61ad32d08bbc319d32a032223d96b45f8ef526ca] | committer: 
Rémi Denis-Courmont

thread: use the generic one-time initializer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=61ad32d08bbc319d32a032223d96b45f8ef526ca
---

 include/vlc_threads.h | 27 ---
 src/android/thread.c  |  6 --
 src/darwin/thread.c   |  6 --
 src/misc/threads.c|  2 --
 src/os2/thread.c  | 28 
 src/posix/thread.c|  6 --
 src/win32/thread.c| 16 
 7 files changed, 91 deletions(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index b04a3305c1..87d0691402 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -61,8 +61,6 @@ typedef struct vlc_thread *vlc_thread_t;
 
 # define LIBVLC_NEED_SLEEP
 #define LIBVLC_NEED_RWLOCK
-typedef INIT_ONCE vlc_once_t;
-#define VLC_STATIC_ONCE INIT_ONCE_STATIC_INIT
 typedef struct vlc_threadvar *vlc_threadvar_t;
 typedef struct vlc_timer *vlc_timer_t;
 
@@ -92,12 +90,6 @@ typedef struct vlc_thread *vlc_thread_t;
 #define VLC_THREAD_CANCELED NULL
 
 #define LIBVLC_NEED_RWLOCK
-typedef struct
-{
-unsigned done;
-vlc_mutex_t mutex;
-} vlc_once_t;
-#define VLC_STATIC_ONCE { 0, VLC_STATIC_MUTEX }
 typedef struct vlc_threadvar *vlc_threadvar_t;
 typedef struct vlc_timer *vlc_timer_t;
 
@@ -142,8 +134,6 @@ static inline int vlc_poll (struct pollfd *fds, unsigned 
nfds, int timeout)
 
 typedef struct vlc_thread *vlc_thread_t;
 #define VLC_THREAD_CANCELED NULL
-typedef pthread_once_t  vlc_once_t;
-#define VLC_STATIC_ONCE   PTHREAD_ONCE_INIT
 typedef pthread_key_t   vlc_threadvar_t;
 typedef struct vlc_timer *vlc_timer_t;
 
@@ -187,8 +177,6 @@ typedef pthread_t   vlc_thread_t;
 #define VLC_THREAD_CANCELED PTHREAD_CANCELED
 typedef pthread_rwlock_t vlc_rwlock_t;
 #define VLC_STATIC_RWLOCK PTHREAD_RWLOCK_INITIALIZER
-typedef pthread_once_t  vlc_once_t;
-#define VLC_STATIC_ONCE   PTHREAD_ONCE_INIT
 typedef pthread_key_t   vlc_threadvar_t;
 typedef struct vlc_timer *vlc_timer_t;
 
@@ -242,19 +230,6 @@ typedef pthread_rwlock_t vlc_rwlock_t;
  */
 #define VLC_STATIC_RWLOCK PTHREAD_RWLOCK_INITIALIZER
 
-/**
- * One-time initialization.
- *
- * A one-time initialization object must always be initialized assigned to
- * \ref VLC_STATIC_ONCE before use.
- */
-typedef pthread_once_t  vlc_once_t;
-
-/**
- * Static initializer for one-time initialization.
- */
-#define VLC_STATIC_ONCE   PTHREAD_ONCE_INIT
-
 /**
  * Thread-local key handle.
  *
@@ -634,7 +609,6 @@ VLC_API void vlc_rwlock_unlock(vlc_rwlock_t *);
 /** @} */
 
 #ifndef __cplusplus
-#if 0
 /**
  * One-time initialization.
  *
@@ -650,7 +624,6 @@ typedef struct
  * Static initializer for one-time initialization.
  */
 #define VLC_STATIC_ONCE { ATOMIC_VAR_INIT(0) }
-#endif
 
 /**
  * Executes a function one time.
diff --git a/src/android/thread.c b/src/android/thread.c
index f831f5b5c1..79132be2e4 100644
--- a/src/android/thread.c
+++ b/src/android/thread.c
@@ -67,12 +67,6 @@ vlc_thread_fatal_print (const char *action, int error,
 # define VLC_THREAD_ASSERT( action ) ((void)val)
 #endif
 
-void vlc_once(vlc_once_t *once, void (*cb)(void))
-{
-int val = pthread_once(once, cb);
-VLC_THREAD_ASSERT("initializing once");
-}
-
 struct vlc_thread
 {
 pthread_t  thread;
diff --git a/src/darwin/thread.c b/src/darwin/thread.c
index 13ccbeed2d..d808543a08 100644
--- a/src/darwin/thread.c
+++ b/src/darwin/thread.c
@@ -145,12 +145,6 @@ void vlc_rwlock_unlock (vlc_rwlock_t *lock)
 VLC_THREAD_ASSERT ("releasing R/W lock");
 }
 
-void vlc_once(vlc_once_t *once, void (*cb)(void))
-{
-int val = pthread_once(once, cb);
-VLC_THREAD_ASSERT("initializing once");
-}
-
 int vlc_threadvar_create (vlc_threadvar_t *key, void (*destr) (void *))
 {
 return pthread_key_create (key, destr);
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 11c46fa730..945b9568f6 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -534,7 +534,6 @@ int vlc_sem_timedwait(vlc_sem_t *sem, vlc_tick_t deadline)
 return 0;
 }
 
-#if 0
 enum { VLC_ONCE_UNDONE, VLC_ONCE_DOING, VLC_ONCE_CONTEND, VLC_ONCE_DONE };
 
 void vlc_once(vlc_once_t *restrict once, void (*cb)(void))
@@ -572,4 +571,3 @@ void vlc_once(vlc_once_t *restrict once, void (*cb)(void))
 value = atomic_load_explicit(&once->value, memory_order_acquire);
 }
 }
-#endif
diff --git a/src/os2/thread.c b/src/os2/thread.c
index 531bdd101b..a5fa6c8bda 100644
--- a/src/os2/thread.c
+++ b/src/os2/thread.c
@@ -168,34 +168,6 @@ unsigned long _System _DLL_InitTerm(unsigned long hmod, 
unsigned long flag)
 return 0;   /* Failed */
 }
 
-void vlc_once(vlc_once_t *once, void (*cb)(void))
-{
-unsigned done;
-
-/* load once->done */
-__atomic_xchg( &done, once->done );
-
-/* not initialized ? */
-if( done == 0 )
-{
-vlc_mutex_lock( &once->mutex );
-
-/* load onc

[vlc-commits] demux: dash: check template seek range

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
17:05:29 2020 +0200| [8f9195f75e3c2a2f041440def1bb1875dbce324a] | committer: 
Francois Cartegnie

demux: dash: check template seek range

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8f9195f75e3c2a2f041440def1bb1875dbce324a
---

 modules/demux/adaptive/playlist/SegmentInformation.cpp | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp 
b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index adbead58f1..ac95876a2d 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -329,7 +329,15 @@ bool SegmentInformation::getSegmentNumberByTime(vlc_tick_t 
time, uint64_t *ret)
 {
 if( getPlaylist()->isLive() )
 {
-*ret = mediaSegmentTemplate->getLiveTemplateNumber(time, 
false);
+vlc_tick_t now = vlc_tick_from_sec(::time(NULL));
+if(getPlaylist()->availabilityStartTime.Get())
+{
+if(time >= getPlaylist()->availabilityStartTime.Get() && 
time < now)
+*ret = 
mediaSegmentTemplate->getLiveTemplateNumber(time, true);
+else if(now - getPlaylist()->availabilityStartTime.Get() > 
time)
+*ret = 
mediaSegmentTemplate->getLiveTemplateNumber(time, false);
+}
+else return false;
 }
 else
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: don't SET_NEXT_DISPLAY_TIME

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
17:41:09 2020 +0200| [d7e2425a328590487d20dbfa0b4bf98fa530c3d1] | committer: 
Francois Cartegnie

demux: adaptive: don't SET_NEXT_DISPLAY_TIME

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d7e2425a328590487d20dbfa0b4bf98fa530c3d1
---

 modules/demux/adaptive/Streams.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/Streams.cpp 
b/modules/demux/adaptive/Streams.cpp
index 668aaec412..87171d76ae 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -574,8 +574,9 @@ bool AbstractStream::setPosition(vlc_tick_t time, bool 
tryonly)
 }
 else fakeEsOut()->commandsQueue()->Abort( true );
 
-es_out_Control(p_realdemux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
-   VLC_TICK_0 + time);
+// in some cases, media time seek != sent dts
+//es_out_Control(p_realdemux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+//   VLC_TICK_0 + time);
 }
 return ret;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: don't SET_NEXT_DISPLAY_TIME

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
17:41:09 2020 +0200| [3be3c2756ba12eda61ca74b16325143b48472631] | committer: 
Francois Cartegnie

demux: adaptive: don't SET_NEXT_DISPLAY_TIME

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3be3c2756ba12eda61ca74b16325143b48472631
---

 modules/demux/adaptive/Streams.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/Streams.cpp 
b/modules/demux/adaptive/Streams.cpp
index 668aaec412..87171d76ae 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -574,8 +574,9 @@ bool AbstractStream::setPosition(vlc_tick_t time, bool 
tryonly)
 }
 else fakeEsOut()->commandsQueue()->Abort( true );
 
-es_out_Control(p_realdemux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
-   VLC_TICK_0 + time);
+// in some cases, media time seek != sent dts
+//es_out_Control(p_realdemux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+//   VLC_TICK_0 + time);
 }
 return ret;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: dash: check template seek range

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
17:05:29 2020 +0200| [81a647db67ddd2a0052b5f28c58c8a24f7f2c4db] | committer: 
Francois Cartegnie

demux: dash: check template seek range

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=81a647db67ddd2a0052b5f28c58c8a24f7f2c4db
---

 modules/demux/adaptive/playlist/SegmentInformation.cpp | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp 
b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index adbead58f1..33057957cc 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -329,7 +329,15 @@ bool SegmentInformation::getSegmentNumberByTime(vlc_tick_t 
time, uint64_t *ret)
 {
 if( getPlaylist()->isLive() )
 {
-*ret = mediaSegmentTemplate->getLiveTemplateNumber(time, 
false);
+vlc_tick_t now = vlc_tick_from_sec(::time(NULL));
+if(getPlaylist()->availabilityStartTime.Get())
+{
+if(time >= getPlaylist()->availabilityStartTime.Get() && 
time < now)
+*ret = 
mediaSegmentTemplate->getLiveTemplateNumber(time, true);
+else if(now - getPlaylist()->availabilityStartTime.Get() > 
now)
+*ret = 
mediaSegmentTemplate->getLiveTemplateNumber(time, false);
+}
+else return false;
 }
 else
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: tiff: Ensure we only build & install the lib

2020-04-02 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Wed Apr  1 
11:14:17 2020 +0200| [52971aeb0e6217132969ba2bae2551d1c7d6cf29] | committer: 
Hugo Beauzée-Luyssen

contrib: tiff: Ensure we only build & install the lib

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52971aeb0e6217132969ba2bae2551d1c7d6cf29
---

 contrib/src/tiff/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/tiff/rules.mak b/contrib/src/tiff/rules.mak
index 378bd538de..da119ad8ca 100644
--- a/contrib/src/tiff/rules.mak
+++ b/contrib/src/tiff/rules.mak
@@ -22,5 +22,5 @@ tiff: tiff-$(TIFF_VERSION).tar.gz .sum-tiff
--disable-cxx \
--without-x
cd $< && $(MAKE) -C port && $(MAKE) -C libtiff
-   cd $< && $(MAKE) install
+   cd $< && $(MAKE) -C libtiff install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] npapi: Fix warning during autoreconf

2020-04-02 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Apr  2 
10:26:37 2020 +0200| [ac33d9ee07c343cc3bc963a19689aa808f676b31] | committer: 
Hugo Beauzée-Luyssen

npapi: Fix warning during autoreconf

extras/package/npapi.am:34: warning: ':='-style assignments are not portable
Makefile.am:219:   'extras/package/win32/package.mak' included from here
extras/package/win32/package.mak:13:   'extras/package/npapi.am' included from 
here

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ac33d9ee07c343cc3bc963a19689aa808f676b31
---

 extras/package/npapi.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 4cb8a15391..91d09e3168 100644
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -31,7 +31,7 @@ npapi-vlc/configure: stamp-npapi
touch $@
 
 if ENABLE_PDB
-ENABLE_PDB_OPTION := --enable-pdb
+ENABLE_PDB_OPTION = --enable-pdb
 endif
 
 npapi-vlc/Makefile: npapi-vlc/configure

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: nettle: Don't generate documentation

2020-04-02 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Wed Apr  1 
16:25:36 2020 +0200| [193d16c2012cd512fdece47186a5ff575a3afd53] | committer: 
Hugo Beauzée-Luyssen

contrib: nettle: Don't generate documentation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=193d16c2012cd512fdece47186a5ff575a3afd53
---

 contrib/src/nettle/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak
index ff0763e4a8..1ae80e84f6 100644
--- a/contrib/src/nettle/rules.mak
+++ b/contrib/src/nettle/rules.mak
@@ -12,6 +12,7 @@ ifeq ($(ARCH),arm)
 NETTLE_CONF += --disable-assembler
 endif
 endif
+NETTLE_CONF += --disable-documentation
 
 $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
$(call download_pkg,$(NETTLE_URL),nettle)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: use microsecond for availability times

2020-04-02 Thread Francois Cartegnie 
vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu Apr  
2 09:21:07 2020 +0200| [c6f8ebe85904669644c123defde8959aa1238979] | committer: 
Francois Cartegnie

demux: adaptive: use microsecond for availability times

(cherry picked from commit ecc878bf87681a24f9e3a1db89971b9ffcaeb1ff)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c6f8ebe85904669644c123defde8959aa1238979
---

 modules/demux/adaptive/playlist/AbstractPlaylist.hpp | 4 ++--
 modules/demux/adaptive/playlist/SegmentTemplate.cpp  | 2 +-
 modules/demux/dash/mpd/IsoffMainParser.cpp   | 6 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp 
b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
index db6db14c3f..602a9b47be 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
@@ -69,8 +69,8 @@ namespace adaptive
 
 Property   duration;
 PropertyplaybackStart;
-PropertyavailabilityEndTime;
-PropertyavailabilityStartTime;
+Property   availabilityEndTime;
+Property   availabilityStartTime;
 Property   minUpdatePeriod;
 Property   maxSegmentDuration;
 Property   timeShiftBufferDepth;
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp 
b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
index c7b3cb2f86..990ee0bb1c 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -161,7 +161,7 @@ uint64_t 
MediaSegmentTemplate::getLiveTemplateNumber(mtime_t playbacktime, bool
 const Timescale timescale = inheritTimescale();
 if(abs)
 {
-mtime_t streamstart = CLOCK_FREQ *
+mtime_t streamstart =
 
parentSegmentInformation->getPlaylist()->availabilityStartTime.Get();
 streamstart += parentSegmentInformation->getPeriodStart();
 playbacktime -= streamstart;
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp 
b/modules/demux/dash/mpd/IsoffMainParser.cpp
index 18306eeb71..67caaf621e 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -137,7 +137,11 @@ voidIsoffMainParser::parseMPDAttributes   (MPD *mpd, 
xml::Node *node)
 
 it = attr.find("availabilityStartTime");
 if(it != attr.end())
-mpd->availabilityStartTime.Set(UTCTime(it->second).time());
+mpd->availabilityStartTime.Set(UTCTime(it->second).mtime());
+
+it = attr.find("availabilityEndTime");
+if(it != attr.end())
+mpd->availabilityEndTime.Set(UTCTime(it->second).mtime());
 
 it = attr.find("timeShiftBufferDepth");
 if(it != attr.end())

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: fix DASH timeshift computation

2020-04-02 Thread Francois Cartegnie 
vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu Apr  
2 13:55:19 2020 +0200| [f9db0de55430577c5ee5a9011e8c1d2be229cf92] | committer: 
Francois Cartegnie

demux: adaptive: fix DASH timeshift computation

(cherry picked from commit 4140d56ebbe41c41460b05e17b83d93d2e9f4c88)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f9db0de55430577c5ee5a9011e8c1d2be229cf92
---

 modules/demux/adaptive/logic/BufferingLogic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/logic/BufferingLogic.cpp 
b/modules/demux/adaptive/logic/BufferingLogic.cpp
index acd075d80a..c95efc803e 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.cpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.cpp
@@ -241,8 +241,8 @@ uint64_t 
DefaultBufferingLogic::getLiveStartSegmentNumber(BaseRepresentation *re
 mtime_t elapsed = now - minavailtime;
 elapsed = elapsed - (elapsed % duration); /* align to last 
segment */
 mtime_t alignednow = minavailtime + elapsed;
-if(mediaSegmentTemplate->duration.Get() < elapsed)
-minavailtime = alignednow - 
mediaSegmentTemplate->duration.Get();
+if(playlist->timeShiftBufferDepth.Get() < elapsed)
+minavailtime = alignednow - 
playlist->timeShiftBufferDepth.Get();
 
 if(playbacktime < minavailtime)
 playbacktime = minavailtime;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: remove UTC time_t

2020-04-02 Thread Francois Cartegnie 
vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu Apr  
2 09:22:36 2020 +0200| [6897c01e6f4b32eb60c52b21905846c690b41927] | committer: 
Francois Cartegnie

demux: adaptive: remove UTC time_t

(cherry picked from commit 354e192b1845ad289a37cf4f6abb55c4d0f27fbf)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6897c01e6f4b32eb60c52b21905846c690b41927
---

 modules/demux/adaptive/tools/Conversions.cpp | 5 -
 modules/demux/adaptive/tools/Conversions.hpp | 1 -
 2 files changed, 6 deletions(-)

diff --git a/modules/demux/adaptive/tools/Conversions.cpp 
b/modules/demux/adaptive/tools/Conversions.cpp
index 1deb3ef3ec..7a93c60ad2 100644
--- a/modules/demux/adaptive/tools/Conversions.cpp
+++ b/modules/demux/adaptive/tools/Conversions.cpp
@@ -169,11 +169,6 @@ UTCTime::UTCTime(const std::string &str)
 }
 }
 
-time_t UTCTime::time() const
-{
-return t / CLOCK_FREQ;
-}
-
 mtime_t UTCTime::mtime() const
 {
 return t;
diff --git a/modules/demux/adaptive/tools/Conversions.hpp 
b/modules/demux/adaptive/tools/Conversions.hpp
index 07c6010916..c899cb16f5 100644
--- a/modules/demux/adaptive/tools/Conversions.hpp
+++ b/modules/demux/adaptive/tools/Conversions.hpp
@@ -38,7 +38,6 @@ class UTCTime
 {
 public:
 UTCTime(const std::string&);
-time_t  time() const;
 mtime_t mtime() const;
 
 private:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sdp: remove no longer used sdp_AddMedia()

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Apr  1 
22:30:29 2020 +0300| [8073567ad3bd144e8316606e21fded8092cc379f] | committer: 
Rémi Denis-Courmont

sdp: remove no longer used sdp_AddMedia()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8073567ad3bd144e8316606e21fded8092cc379f
---

 include/vlc_sout.h  |  5 -
 src/libvlccore.sym  |  1 -
 src/missing.c   | 12 
 src/stream_output/sdp.c | 34 --
 4 files changed, 52 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index e5f7eebf0e..9b9c898cfc 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -282,11 +282,6 @@ VLC_API int vlc_sdp_Start(struct vlc_memstream *, 
vlc_object_t *obj,
   const char *cfgpref,
   const struct sockaddr *src, size_t slen,
   const struct sockaddr *addr, size_t alen) VLC_USED;
-VLC_API void sdp_AddMedia(struct vlc_memstream *, const char *type,
-  const char *protocol, int dport, unsigned pt,
-  bool bw_indep, unsigned bw, const char *ptname,
-  unsigned clockrate, unsigned channels,
-  const char *fmtp);
 
 /** @} */
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 2cf98e5091..cc8098edd9 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -322,7 +322,6 @@ picture_pool_Wait
 picture_Reset
 picture_Setup
 plane_CopyPixels
-sdp_AddMedia
 secstotimestr
 sout_AccessOutControl
 sout_AccessOutDelete
diff --git a/src/missing.c b/src/missing.c
index 2ebd9ab8be..34283b63eb 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -42,18 +42,6 @@
 #ifndef ENABLE_SOUT
 # include 
 
-void sdp_AddMedia (struct vlc_memstream *sdp, const char *type, const char 
*protocol,
-int dport, unsigned pt, bool bw_indep, unsigned bw,
-const char *ptname, unsigned clockrate, unsigned channels,
-const char *fmtp)
-{
-VLC_UNUSED (sdp); VLC_UNUSED (type); VLC_UNUSED (protocol);
-VLC_UNUSED (dport); VLC_UNUSED (pt); VLC_UNUSED (bw_indep);
-VLC_UNUSED (bw); VLC_UNUSED (ptname); VLC_UNUSED (clockrate);
-VLC_UNUSED (channels); VLC_UNUSED (fmtp);
-assert (sdp == NULL);
-}
-
 noreturn int sout_AccessOutControl(sout_access_out_t *out, int query, ...)
 {
 VLC_UNUSED (out); VLC_UNUSED (query);
diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index 65aefa4cb4..0c9ca23e42 100644
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -90,40 +90,6 @@ static bool IsSDPString (const char *str)
 return true;
 }
 
-void sdp_AddMedia(struct vlc_memstream *restrict stream,
-  const char *type, const char *proto, int dport,
-  unsigned pt, bool bw_indep, unsigned bw,
-  const char *ptname, unsigned clock, unsigned chans,
-  const char *fmtp)
-{
-/* Some default values */
-if (type == NULL)
-type = "video";
-if (proto == NULL)
-proto = "RTP/AVP";
-assert (pt < 128u);
-
-vlc_memstream_printf(stream, "m=%s %u %s %u\r\n", type, dport, proto, pt);
-
-if (bw > 0)
-vlc_memstream_printf(stream, "b=%s:%u\r\n",
- bw_indep ? "TIAS" : "AS", bw);
-vlc_memstream_printf(stream, "b=%s:%u\r\n", "RR", 0);
-
-/* RTP payload type map */
-if (ptname != NULL)
-{
-vlc_memstream_printf(stream, "a=rtpmap:%u %s/%u", pt, ptname, clock);
-if ((strcmp(type, "audio") == 0) && (chans != 1))
-vlc_memstream_printf(stream, "/%u", chans);
-vlc_memstream_puts(stream, "\r\n");
-}
-
-/* Format parameters */
-if (fmtp != NULL)
-vlc_memstream_printf(stream, "a=fmtp:%u %s\r\n", pt, fmtp);
-}
-
 int vlc_sdp_Start(struct vlc_memstream *restrict stream,
   vlc_object_t *obj, const char *cfgpref,
   const struct sockaddr *src, size_t srclen,

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Forbid sdp_ prefix in symbols

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Apr  1 
22:33:38 2020 +0300| [02ae15408a4462d0e6774d6a1b83eb95f231f398] | committer: 
Rémi Denis-Courmont

Forbid sdp_ prefix in symbols

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02ae15408a4462d0e6774d6a1b83eb95f231f398
---

 src/check_symbols | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/check_symbols b/src/check_symbols
index ef0b7a1216..2d9e427d09 100755
--- a/src/check_symbols
+++ b/src/check_symbols
@@ -20,7 +20,7 @@ cat libvlccore.sym | grep -v \
-e '^text_style_' -e '^text_segment_' \
-e '^net_' -e '^httpd_' \
-e '^config_' -e '^module_' -e '^var_' \
-   -e '^date_' -e '^sdp_' -e '^plane_' \
+   -e '^date_' -e '^plane_' \
-e '^us_' -e '^utf8_' -e '^xml_' -e '^GetLang_' \
-e '^m\(date\|sleep\|wait\)$' -e '^[A-Z][a-z]*Charset$' -e 'MD5$' \
-e '^NTPtime64$' -e '^secstotimestr$' \

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fix indentation

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Apr  2 
17:10:22 2020 +0300| [d2307f30a6f70887407ded3f84e888567031bcfd] | committer: 
Rémi Denis-Courmont

Fix indentation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d2307f30a6f70887407ded3f84e888567031bcfd
---

 include/vlc_bits.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vlc_bits.h b/include/vlc_bits.h
index b6b222125b..c6a0bbb8de 100644
--- a/include/vlc_bits.h
+++ b/include/vlc_bits.h
@@ -202,12 +202,12 @@ static inline uint32_t bs_read( bs_t *s, uint8_t i_count )
 {
 i_shr = i_count - s->i_left;
 /* less in the buffer than requested */
-   if( i_shr >= 32 )
-   i_result = 0;
-   else
-   i_result |= (*s->p&i_mask[s->i_left]) << i_shr;
-   i_count  -= s->i_left;
-   s->i_left = 0;
+if( i_shr >= 32 )
+i_result = 0;
+else
+i_result |= (*s->p&i_mask[s->i_left]) << i_shr;
+i_count  -= s->i_left;
+s->i_left = 0;
 }
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sdp: remove no longer used sdp_AddAttribute()

2020-04-02 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Apr  1 
22:30:29 2020 +0300| [b58aacd5746063a0e167aa35e15dbab9c9533e31] | committer: 
Rémi Denis-Courmont

sdp: remove no longer used sdp_AddAttribute()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b58aacd5746063a0e167aa35e15dbab9c9533e31
---

 include/vlc_sout.h  |  2 --
 src/libvlccore.sym  |  1 -
 src/missing.c   |  6 --
 src/stream_output/sdp.c | 23 ---
 4 files changed, 32 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 4534d9f5d5..e5f7eebf0e 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -287,8 +287,6 @@ VLC_API void sdp_AddMedia(struct vlc_memstream *, const 
char *type,
   bool bw_indep, unsigned bw, const char *ptname,
   unsigned clockrate, unsigned channels,
   const char *fmtp);
-VLC_API void sdp_AddAttribute(struct vlc_memstream *, const char *name,
-  const char *fmt, ...) VLC_FORMAT(3, 4);
 
 /** @} */
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 9effd1246e..2cf98e5091 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -322,7 +322,6 @@ picture_pool_Wait
 picture_Reset
 picture_Setup
 plane_CopyPixels
-sdp_AddAttribute
 sdp_AddMedia
 secstotimestr
 sout_AccessOutControl
diff --git a/src/missing.c b/src/missing.c
index 982df95d36..2ebd9ab8be 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -54,12 +54,6 @@ void sdp_AddMedia (struct vlc_memstream *sdp, const char 
*type, const char *prot
 assert (sdp == NULL);
 }
 
-void sdp_AddAttribute (struct vlc_memstream *sdp, const char *name, const char 
*fmt, ...)
-{
-VLC_UNUSED (sdp); VLC_UNUSED (name); VLC_UNUSED (fmt);
-assert (sdp == NULL);
-}
-
 noreturn int sout_AccessOutControl(sout_access_out_t *out, int query, ...)
 {
 VLC_UNUSED (out); VLC_UNUSED (query);
diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index dc13ec0601..65aefa4cb4 100644
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -90,29 +90,6 @@ static bool IsSDPString (const char *str)
 return true;
 }
 
-static void vsdp_AddAttribute(struct vlc_memstream *restrict stream,
-  const char *name, const char *fmt, va_list ap)
-{
-if (fmt == NULL)
-{
-vlc_memstream_printf(stream, "a=%s\r\n", name);
-return;
-}
-vlc_memstream_printf(stream, "a=%s:", name);
-vlc_memstream_vprintf(stream, fmt, ap);
-vlc_memstream_puts(stream, "\r\n");
-}
-
-void sdp_AddAttribute(struct vlc_memstream *restrict stream, const char *name,
-  const char *fmt, ...)
-{
-va_list ap;
-
-va_start(ap, fmt);
-vsdp_AddAttribute(stream, name, fmt, ap);
-va_end(ap);
-}
-
 void sdp_AddMedia(struct vlc_memstream *restrict stream,
   const char *type, const char *proto, int dport,
   unsigned pt, bool bw_indep, unsigned bw,

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: fix DASH timeshift computation

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
13:55:19 2020 +0200| [4140d56ebbe41c41460b05e17b83d93d2e9f4c88] | committer: 
Francois Cartegnie

demux: adaptive: fix DASH timeshift computation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4140d56ebbe41c41460b05e17b83d93d2e9f4c88
---

 modules/demux/adaptive/logic/BufferingLogic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/logic/BufferingLogic.cpp 
b/modules/demux/adaptive/logic/BufferingLogic.cpp
index 8793027a11..8787ce5122 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.cpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.cpp
@@ -241,8 +241,8 @@ uint64_t 
DefaultBufferingLogic::getLiveStartSegmentNumber(BaseRepresentation *re
 vlc_tick_t elapsed = now - minavailtime;
 elapsed = elapsed - (elapsed % duration); /* align to last 
segment */
 vlc_tick_t alignednow = minavailtime + elapsed;
-if(mediaSegmentTemplate->duration.Get() < elapsed)
-minavailtime = alignednow - 
mediaSegmentTemplate->duration.Get();
+if(playlist->timeShiftBufferDepth.Get() < elapsed)
+minavailtime = alignednow - 
playlist->timeShiftBufferDepth.Get();
 
 if(playbacktime < minavailtime)
 playbacktime = minavailtime;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: use microsecond for availability times

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
09:21:07 2020 +0200| [ecc878bf87681a24f9e3a1db89971b9ffcaeb1ff] | committer: 
Francois Cartegnie

demux: adaptive: use microsecond for availability times

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ecc878bf87681a24f9e3a1db89971b9ffcaeb1ff
---

 modules/demux/adaptive/playlist/AbstractPlaylist.hpp | 4 ++--
 modules/demux/adaptive/playlist/SegmentTemplate.cpp  | 2 +-
 modules/demux/dash/mpd/IsoffMainParser.cpp   | 6 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp 
b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
index a7eb0fda22..3d0e3cf66d 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
@@ -69,8 +69,8 @@ namespace adaptive
 
 Property   duration;
 PropertyplaybackStart;
-PropertyavailabilityEndTime;
-PropertyavailabilityStartTime;
+Property   availabilityEndTime;
+Property   availabilityStartTime;
 Property   minUpdatePeriod;
 Property   maxSegmentDuration;
 Property   timeShiftBufferDepth;
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp 
b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
index b024936763..0760fb5e7b 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -161,7 +161,7 @@ uint64_t 
MediaSegmentTemplate::getLiveTemplateNumber(vlc_tick_t playbacktime, bo
 if(abs)
 {
 vlc_tick_t streamstart =
-
vlc_tick_from_sec(parentSegmentInformation->getPlaylist()->availabilityStartTime.Get());
+
parentSegmentInformation->getPlaylist()->availabilityStartTime.Get();
 streamstart += parentSegmentInformation->getPeriodStart();
 playbacktime -= streamstart;
 }
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp 
b/modules/demux/dash/mpd/IsoffMainParser.cpp
index 3a09354c84..3e8eee2049 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -139,7 +139,11 @@ voidIsoffMainParser::parseMPDAttributes   (MPD *mpd, 
xml::Node *node)
 
 it = attr.find("availabilityStartTime");
 if(it != attr.end())
-mpd->availabilityStartTime.Set(UTCTime(it->second).time());
+mpd->availabilityStartTime.Set(UTCTime(it->second).mtime());
+
+it = attr.find("availabilityEndTime");
+if(it != attr.end())
+mpd->availabilityEndTime.Set(UTCTime(it->second).mtime());
 
 it = attr.find("timeShiftBufferDepth");
 if(it != attr.end())

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: remove UTC time_t

2020-04-02 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Apr  2 
09:22:36 2020 +0200| [354e192b1845ad289a37cf4f6abb55c4d0f27fbf] | committer: 
Francois Cartegnie

demux: adaptive: remove UTC time_t

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=354e192b1845ad289a37cf4f6abb55c4d0f27fbf
---

 modules/demux/adaptive/tools/Conversions.cpp | 5 -
 modules/demux/adaptive/tools/Conversions.hpp | 1 -
 2 files changed, 6 deletions(-)

diff --git a/modules/demux/adaptive/tools/Conversions.cpp 
b/modules/demux/adaptive/tools/Conversions.cpp
index 92b6b99ef7..f808c3822a 100644
--- a/modules/demux/adaptive/tools/Conversions.cpp
+++ b/modules/demux/adaptive/tools/Conversions.cpp
@@ -174,11 +174,6 @@ UTCTime::UTCTime(const std::string &str)
 }
 }
 
-time_t UTCTime::time() const
-{
-return SEC_FROM_VLC_TICK(t);
-}
-
 vlc_tick_t UTCTime::mtime() const
 {
 return t;
diff --git a/modules/demux/adaptive/tools/Conversions.hpp 
b/modules/demux/adaptive/tools/Conversions.hpp
index 1d95cfdf4e..a22b17b4ec 100644
--- a/modules/demux/adaptive/tools/Conversions.hpp
+++ b/modules/demux/adaptive/tools/Conversions.hpp
@@ -38,7 +38,6 @@ class UTCTime
 {
 public:
 UTCTime(const std::string&);
-time_t  time() const;
 vlc_tick_t mtime() const;
 
 private:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Update NEWS

2020-04-02 Thread Pierre Ynard 
vlc/vlc-3.0 | branch: master | Pierre Ynard  | Thu Apr  2 
13:25:21 2020 +0200| [55a3c0782d5b73f9cee48d5bbc6a1c42040f6c96] | committer: 
Pierre Ynard

Update NEWS

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=55a3c0782d5b73f9cee48d5bbc6a1c42040f6c96
---

 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 939c35b8a1..fdeae39b89 100644
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,8 @@ macOS:
in digital mode
 
 Misc:
+ * Update YouTube, SoundCloud and Vocaroo scripts: this restores
+   playback of YouTube URLs.
  * Add missing .wpl & .zpl file associations on Windows
 
 Changes between 3.0.7.1 and 3.0.8:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] opengl: fix xyz12 fragment shader

2020-04-02 Thread Romain Vimont 
vlc | branch: master | Romain Vimont  | Tue Mar 31 11:05:38 
2020 +0200| [b6a622e275e92bb89a94e23be8d1a142f72b93e8] | committer: Steve Lhomme

opengl: fix xyz12 fragment shader

Commits bf4f21b54f03e7b33c5c55d3171caf06d1482459 and
cb16845b7e1244f3a7085276489f9dd2e01a2949 moved transformations from the
renderer to the (sampler) fragment shader.

But the transformations were applied only on the "main" fragment shader.
Also apply them on the specific fragment shader generated for XYZ12
chroma.

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6a622e275e92bb89a94e23be8d1a142f72b93e8
---

 modules/video_output/opengl/fragment_shaders.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/fragment_shaders.c 
b/modules/video_output/opengl/fragment_shaders.c
index 9bc7e9b6bd..117020cbe7 100644
--- a/modules/video_output/opengl/fragment_shaders.c
+++ b/modules/video_output/opengl/fragment_shaders.c
@@ -347,10 +347,16 @@ xyz12_shader_init(struct vlc_gl_renderer *renderer)
 "0.0,  0.0, 0.0,1.0 "
 " );"
 
+"uniform mat4 TransformMatrix;\n"
+"uniform mat4 OrientationMatrix;\n"
+"uniform mat3 TexCoordsMap0;\n"
 "vec4 vlc_texture(vec2 pic_coords)\n"
 "{ "
 " vec4 v_in, v_out;"
-" v_in  = texture2D(Texture0, pic_coords);"
+/* Homogeneous (oriented) coordinates */
+" vec3 pic_hcoords = vec3((TransformMatrix * OrientationMatrix * 
vec4(pic_coords, 0.0, 1.0)).st, 1.0);\n"
+" vec2 tex_coords = (TexCoordsMap0 * pic_hcoords).st;\n"
+" v_in  = texture2D(Texture0, tex_coords);\n"
 " v_in = pow(v_in, xyz_gamma);"
 " v_out = matrix_xyz_rgb * v_in ;"
 " v_out = pow(v_out, rgb_gamma) ;"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/npapi-vlc][3.0.x] add an option to generate and keep PDB files

2020-04-02 Thread Jean-Baptiste Kempf 


Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC Browser Plugins


Commits:
b452bf32 by Steve Lhomme at 2020-03-31T08:58:18+02:00
add an option to generate and keep PDB files

Similar to how it's done in VLC

- - - - -


3 changed files:

- activex/Makefile.am
- configure.ac
- npapi/Makefile.am


Changes:

=
activex/Makefile.am
=
@@ -73,6 +73,11 @@ axvlc_la_LDFLAGS = -Wl,--kill-at -Wl,$(DATA_axvlc_rc) \
 -Wc,--static -Wc,-static-libgcc
 axvlc_la_LIBADD = ../common/libvlcplugin_common.la \
$(LIBVLC_LIBS) $(ACTIVEX_LIBS)
+if ENABLE_PDB
+# libtool magic path
+axvlc_la_DATA = .libs/axvlc.pdb
+axvlc_ladir = /lib
+endif
 
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)


=
configure.ac
=
@@ -280,6 +280,20 @@ AS_IF([ test "x$gtk_found" = "xyes" ],
 AM_CONDITIONAL(WITH_GTK, [ test "x$gtk_found" = "xyes" ])
 AM_CONDITIONAL(HAVE_XCB, [ test "x$xcb_found" = "xyes" ])
 
+vlc_build_pdb=0
+AC_ARG_ENABLE([pdb],
+ AS_HELP_STRING([--enable-pdb],
+[Build PDB files for windows targets (default off)]))
+AS_IF([test "${SYS}" = "mingw32"],[
+  AS_IF([test "${enable_pdb}" = "yes"], [
+vlc_build_pdb=1
+AX_APPEND_FLAG([-g -gcodeview],[CFLAGS])
+AX_APPEND_FLAG([-g -gcodeview],[CXXFLAGS])
+LDFLAGS="${LDFLAGS} -Wl,-pdb="
+  ],[])
+])
+AM_CONDITIONAL([ENABLE_PDB],   [test "$vlc_build_pdb" = "1"])
+
 dnl
 dnl final flags for ActiveX
 AM_COND_IF([HAVE_WIN32], [


=
npapi/Makefile.am
=
@@ -41,6 +41,11 @@ npvlc_la_SOURCES = $(libvlcplugin_la_SOURCES)
 npvlc_la_DEPENDENCIES = $(libvlcplugin_la_DEPENDENCIES)
 npvlc_la_LIBADD = $(libvlcplugin_la_LIBADD)
 npvlc_la_LDFLAGS = $(libvlcplugin_la_LDFLAGS)
+if ENABLE_PDB
+# libtool magic path
+npvlc_la_DATA = .libs/npvlc.pdb
+npvlc_ladir = /lib
+endif
 
 npapi-sdk:
wget 
https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/npapi-sdk/source-archive.zip



View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/b452bf32f7f961bbe2136939e73117fa917aeea1

-- 
View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/b452bf32f7f961bbe2136939e73117fa917aeea1
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] add an option to generate and keep PDB files

2020-04-02 Thread Steve Lhomme 
npapi-vlc | branch: 3.0.x | Steve Lhomme  | Mon Mar 30 
15:39:18 2020 +0200| [b452bf32f7f961bbe2136939e73117fa917aeea1] | committer: 
Steve Lhomme

add an option to generate and keep PDB files

Similar to how it's done in VLC

> https://code.videolan.org/videolan/npapi-vlc/commit/b452bf32f7f961bbe2136939e73117fa917aeea1
---

 activex/Makefile.am |  5 +
 configure.ac| 14 ++
 npapi/Makefile.am   |  5 +
 3 files changed, 24 insertions(+)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index d358b23..df66cc8 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -73,6 +73,11 @@ axvlc_la_LDFLAGS = -Wl,--kill-at -Wl,$(DATA_axvlc_rc) \
 -Wc,--static -Wc,-static-libgcc
 axvlc_la_LIBADD = ../common/libvlcplugin_common.la \
$(LIBVLC_LIBS) $(ACTIVEX_LIBS)
+if ENABLE_PDB
+# libtool magic path
+axvlc_la_DATA = .libs/axvlc.pdb
+axvlc_ladir = /lib
+endif
 
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
diff --git a/configure.ac b/configure.ac
index 6836770..d9ed0fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,20 @@ AS_IF([ test "x$gtk_found" = "xyes" ],
 AM_CONDITIONAL(WITH_GTK, [ test "x$gtk_found" = "xyes" ])
 AM_CONDITIONAL(HAVE_XCB, [ test "x$xcb_found" = "xyes" ])
 
+vlc_build_pdb=0
+AC_ARG_ENABLE([pdb],
+ AS_HELP_STRING([--enable-pdb],
+[Build PDB files for windows targets (default off)]))
+AS_IF([test "${SYS}" = "mingw32"],[
+  AS_IF([test "${enable_pdb}" = "yes"], [
+vlc_build_pdb=1
+AX_APPEND_FLAG([-g -gcodeview],[CFLAGS])
+AX_APPEND_FLAG([-g -gcodeview],[CXXFLAGS])
+LDFLAGS="${LDFLAGS} -Wl,-pdb="
+  ],[])
+])
+AM_CONDITIONAL([ENABLE_PDB],   [test "$vlc_build_pdb" = "1"])
+
 dnl
 dnl final flags for ActiveX
 AM_COND_IF([HAVE_WIN32], [
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index db3158f..a4227d2 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -41,6 +41,11 @@ npvlc_la_SOURCES = $(libvlcplugin_la_SOURCES)
 npvlc_la_DEPENDENCIES = $(libvlcplugin_la_DEPENDENCIES)
 npvlc_la_LIBADD = $(libvlcplugin_la_LIBADD)
 npvlc_la_LDFLAGS = $(libvlcplugin_la_LDFLAGS)
+if ENABLE_PDB
+# libtool magic path
+npvlc_la_DATA = .libs/npvlc.pdb
+npvlc_ladir = /lib
+endif
 
 npapi-sdk:
wget 
https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/npapi-sdk/source-archive.zip

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/npapi-vlc][master] 2 commits: test WIDL with the WIDLFLAGS

2020-04-02 Thread Jean-Baptiste Kempf 


Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Browser Plugins


Commits:
eb385fa5 by Steve Lhomme at 2020-04-02T10:24:47+02:00
test WIDL with the WIDLFLAGS

- - - - -
1d7d0288 by Steve Lhomme at 2020-04-02T10:24:47+02:00
fix stdole2.tlb dependency

- - - - -


2 changed files:

- activex/Makefile.am
- configure.ac


Changes:

=
activex/Makefile.am
=
@@ -102,12 +102,13 @@ WINE_SDK_PATH ?= /usr/include/wine/windows
 stdole2.tlb stdole2_idl.c stdole2_idl.h: $(WINE_SDK_PATH)/stdole2.idl
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -t -u -h -T stdole2.tlb -U 
stdole2_idl.c -H stdole2_idl.h $<
 
-if !HAS_STDOLE2_TLB
-axvlc.tlb: stdole2.tlb
-endif
-
+if HAS_STDOLE2_TLB
 axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U 
axvlc_idl.c -H axvlc_idl.h $<
+else
+axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl stdole2.tlb
+   $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U 
axvlc_idl.c -H axvlc_idl.h $<
+endif
 
 clean-tlb:
rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h stdole2.tlb stdole2_idl.c 
stdole2_idl.h


=
configure.ac
=
@@ -136,7 +136,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
 AS_IF([test "${WIDL}" != "no"],[
   ac_ext=idl
   ac_objext=tlb
-  ac_compile='$WIDL -t conftest.$ac_ext -o conftest.$ac_objext'
+  ac_compile='$WIDL $WIDLFLAGS -t conftest.$ac_ext -o conftest.$ac_objext'
   cat <<_ACEOF >conftest.idl
 import "ocidl.idl";
 [[



View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/compare/4c7155f3f155dbb6bb90788b80d3b85572cde3b4...1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45

-- 
View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/compare/4c7155f3f155dbb6bb90788b80d3b85572cde3b4...1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] test WIDL with the WIDLFLAGS

2020-04-02 Thread Steve Lhomme 
npapi-vlc | branch: master | Steve Lhomme  | Thu Apr  2 
09:37:46 2020 +0200| [eb385fa562969526631d502beb73324efc5a2e6b] | committer: 
Steve Lhomme

test WIDL with the WIDLFLAGS

> https://code.videolan.org/videolan/npapi-vlc/commit/eb385fa562969526631d502beb73324efc5a2e6b
---

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c552072..694cd7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
 AS_IF([test "${WIDL}" != "no"],[
   ac_ext=idl
   ac_objext=tlb
-  ac_compile='$WIDL -t conftest.$ac_ext -o conftest.$ac_objext'
+  ac_compile='$WIDL $WIDLFLAGS -t conftest.$ac_ext -o conftest.$ac_objext'
   cat <<_ACEOF >conftest.idl
 import "ocidl.idl";
 [[

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] fix stdole2.tlb dependency

2020-04-02 Thread Steve Lhomme 
npapi-vlc | branch: master | Steve Lhomme  | Thu Apr  2 
10:20:01 2020 +0200| [1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45] | committer: 
Steve Lhomme

fix stdole2.tlb dependency

> https://code.videolan.org/videolan/npapi-vlc/commit/1d7d0288fa03c22e5c01d790dbaa1ac48ddc2b45
---

 activex/Makefile.am | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 4dc4b89..206b83e 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -102,12 +102,13 @@ WINE_SDK_PATH ?= /usr/include/wine/windows
 stdole2.tlb stdole2_idl.c stdole2_idl.h: $(WINE_SDK_PATH)/stdole2.idl
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -t -u -h -T stdole2.tlb -U 
stdole2_idl.c -H stdole2_idl.h $<
 
-if !HAS_STDOLE2_TLB
-axvlc.tlb: stdole2.tlb
-endif
-
+if HAS_STDOLE2_TLB
 axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U 
axvlc_idl.c -H axvlc_idl.h $<
+else
+axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl stdole2.tlb
+   $(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U 
axvlc_idl.c -H axvlc_idl.h $<
+endif
 
 clean-tlb:
rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h stdole2.tlb stdole2_idl.c 
stdole2_idl.h

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: win32: Remove an unused local property key definition

2020-04-02 Thread Martin Storsjö 
vlc | branch: master | Martin Storsjö  | Thu Apr  2 09:59:05 
2020 +0300| [5398108a0c52d20ba0f657339a4465136b80e4e5] | committer: Martin 
Storsjö

vout: win32: Remove an unused local property key definition

This one used to be missing from mingw-w64 headers, but was added there
yesterday in git master.

If this one actually is used, and we can't be sure of whether it exists
in system headers, we could define it ourselves, but with a unique
prefix. But in this case it simply seems to be unused.

This fixes compilation with the very latest mingw-w64 headers.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5398108a0c52d20ba0f657339a4465136b80e4e5
---

 modules/video_output/win32/sensors.cpp | 4 
 1 file changed, 4 deletions(-)

diff --git a/modules/video_output/win32/sensors.cpp 
b/modules/video_output/win32/sensors.cpp
index 17727afaad..34794ef6d2 100644
--- a/modules/video_output/win32/sensors.cpp
+++ b/modules/video_output/win32/sensors.cpp
@@ -35,10 +35,6 @@
 
 #include 
 
-#ifndef _MSC_VER
-DEFINE_PROPERTYKEY(SENSOR_DATA_TYPE_MAGNETOMETER_ACCURACY, 0x1637d8a2, 0x4248, 
0x4275, 0x86, 0x5d, 0x55, 0x8d, 0xe8, 0x4a, 0xed, 0xfd, 22);
-#endif
-
 class SensorReceiver : public ISensorEvents
 {
 public:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits