[vlc-commits] contrib: x265: do not copy .pdb files that don't exist

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Fri May 18 
16:32:17 2018 +0200| [c6575163e3c1c9505a05971d259104f2aaf11563] | committer: 
Jean-Baptiste Kempf

contrib: x265: do not copy .pdb files that don't exist

(cherry picked from commit 61a022426778489a73eb5cd85591a904e513820e)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/x265/rules.mak |  1 +
 contrib/src/x265/x265-no-pdb-install.patch | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 4cdd0de896..0a07154b04 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -27,6 +27,7 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
mkdir -p $@-$(X265_VERSION)
tar xvjf "$<" --strip-components=1 -C $@-$(X265_VERSION)
$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
+   $(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
$(call pkg_static,"source/x265.pc.in")
 ifndef HAVE_WIN32
$(APPLY) $(SRC)/x265/x265-pkg-libs.patch
diff --git a/contrib/src/x265/x265-no-pdb-install.patch 
b/contrib/src/x265/x265-no-pdb-install.patch
new file mode 100644
index 00..38ed618ecd
--- /dev/null
+++ b/contrib/src/x265/x265-no-pdb-install.patch
@@ -0,0 +1,11 @@
+--- x265/source/CMakeLists.txt.nopdb   2018-05-18 16:28:43.150790700 +0200
 x265/source/CMakeLists.txt 2018-05-18 16:28:53.838634400 +0200
+@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+ endif()
+ install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION 
include)
+-if(WIN32)
++if(WIN32 AND MSVC_IDE)
+ if(MSVC_IDE)
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION 
${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" 
DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)

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

[vlc-commits] contrib: vncclient: fix gnutls sub-dependencies

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Fri May 18 
17:00:23 2018 +0200| [4ce7c9fa265d72639f28ca3539955e4cdcb2ef4c] | committer: 
Jean-Baptiste Kempf

contrib: vncclient: fix gnutls sub-dependencies

(cherry picked from commit f5edd63ba69030c5c1f93124e0456c0eef2e1800)
Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/contrib/src/vncclient/rules.mak b/contrib/src/vncclient/rules.mak
index ce58a16a4b..bd0e3d39c8 100644
--- a/contrib/src/vncclient/rules.mak
+++ b/contrib/src/vncclient/rules.mak
@@ -28,7 +28,7 @@ vncclient: LibVNCServer-$(VNCCLIENT_VERSION).tar.gz 
.sum-vncclient
$(UPDATE_AUTOCONFIG)
$(MOVE)
 
-DEPS_vncclient = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) 
gnutls $(DEP_gnutls)
+DEPS_vncclient = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) 
gnutls $(DEPS_gnutls)
 
 .vncclient: vncclient
$(RECONF)

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

[vlc-commits] contrib: harfbuzz: force freetype detection with Cmake

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Fri 
May 18 18:03:21 2018 +0200| [8ea489a695c3cfc94ff4cdfa2a29cef8796e0053] | 
committer: Jean-Baptiste Kempf

contrib: harfbuzz: force freetype detection with Cmake

Remove outdated conf and fix upstream linking for tests

(cherry picked from commit f683a4430647564aac0a9517ba3110570dab0c9c)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/harfbuzz/Cmake-test.patch | 11 +++
 contrib/src/harfbuzz/rules.mak|  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/contrib/src/harfbuzz/Cmake-test.patch 
b/contrib/src/harfbuzz/Cmake-test.patch
new file mode 100644
index 00..e9bda83b5c
--- /dev/null
+++ b/contrib/src/harfbuzz/Cmake-test.patch
@@ -0,0 +1,11 @@
+--- harfbuzz/CMakeLists.txt.old2018-02-28 22:59:53.0 +0100
 harfbuzz/CMakeLists.txt2018-05-18 18:00:47.589767685 +0200
+@@ -272,7 +272,7 @@
+ message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. 
Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")
+   endif ()
+ 
+-  list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES})
++  list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES} -lz)
+   include_directories(AFTER ${FREETYPE_INCLUDE_DIRS})
+   add_definitions(-DHAVE_FREETYPE=1)
+ 
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 3ccdcc7ca5..294deb2ca9 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -7,8 +7,6 @@ ifeq ($(call need_pkg,"harfbuzz"),)
 PKGS_FOUND += harfbuzz
 endif
 
-HARFBUZZCONF = --with-icu=no --with-glib=no --with-fontconfig=no
-
 ifdef HAVE_DARWIN_OS
 HARFBUZZCONF += --with-coretext=yes
 endif
@@ -22,13 +20,14 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(UNPACK)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
+   $(APPLY) $(SRC)/harfbuzz/Cmake-test.patch
$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
 .harfbuzz: harfbuzz toolchain.cmake
cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
-   -DBUILD_SHARED_LIBS:BOOL=OFF \
+   -DBUILD_SHARED_LIBS:BOOL=OFF -DHB_HAVE_FREETYPE:BOOL=ON \
.. && $(MAKE)
cd $< && cd build && $(MAKE) install
touch $@

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

[vlc-commits] contrib: harfbuzz: force freetype detection with Cmake

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf  | Fri May 18 
18:03:21 2018 +0200| [f683a4430647564aac0a9517ba3110570dab0c9c] | committer: 
Jean-Baptiste Kempf

contrib: harfbuzz: force freetype detection with Cmake

Remove outdated conf and fix upstream linking for tests

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

 contrib/src/harfbuzz/Cmake-test.patch | 11 +++
 contrib/src/harfbuzz/rules.mak|  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/contrib/src/harfbuzz/Cmake-test.patch 
b/contrib/src/harfbuzz/Cmake-test.patch
new file mode 100644
index 00..e9bda83b5c
--- /dev/null
+++ b/contrib/src/harfbuzz/Cmake-test.patch
@@ -0,0 +1,11 @@
+--- harfbuzz/CMakeLists.txt.old2018-02-28 22:59:53.0 +0100
 harfbuzz/CMakeLists.txt2018-05-18 18:00:47.589767685 +0200
+@@ -272,7 +272,7 @@
+ message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. 
Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")
+   endif ()
+ 
+-  list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES})
++  list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES} -lz)
+   include_directories(AFTER ${FREETYPE_INCLUDE_DIRS})
+   add_definitions(-DHAVE_FREETYPE=1)
+ 
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 3ccdcc7ca5..294deb2ca9 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -7,8 +7,6 @@ ifeq ($(call need_pkg,"harfbuzz"),)
 PKGS_FOUND += harfbuzz
 endif
 
-HARFBUZZCONF = --with-icu=no --with-glib=no --with-fontconfig=no
-
 ifdef HAVE_DARWIN_OS
 HARFBUZZCONF += --with-coretext=yes
 endif
@@ -22,13 +20,14 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(UNPACK)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
+   $(APPLY) $(SRC)/harfbuzz/Cmake-test.patch
$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
 .harfbuzz: harfbuzz toolchain.cmake
cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
-   -DBUILD_SHARED_LIBS:BOOL=OFF \
+   -DBUILD_SHARED_LIBS:BOOL=OFF -DHB_HAVE_FREETYPE:BOOL=ON \
.. && $(MAKE)
cd $< && cd build && $(MAKE) install
touch $@

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

[vlc-commits] demux: ts: add adts probing

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu May 
17 10:25:20 2018 +0200| [87ad4b49c2eb42b20361a9e29fb9a4dba01116bd] | committer: 
Jean-Baptiste Kempf

demux: ts: add adts probing

(cherry picked from commit 3a8ae5e94f4a51f04a83a18abbd366ed4589b573)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/demux/mpeg/ts_hotfixes.c | 6 ++
 modules/demux/mpeg/ts_pid.h  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/modules/demux/mpeg/ts_hotfixes.c b/modules/demux/mpeg/ts_hotfixes.c
index 206537470f..f09fe9a391 100644
--- a/modules/demux/mpeg/ts_hotfixes.c
+++ b/modules/demux/mpeg/ts_hotfixes.c
@@ -185,6 +185,11 @@ void ProbePES( demux_t *p_demux, ts_pid_t *pid, const 
uint8_t *p_pesstart, size_
 break;
 }
 }
+else if( p_data[0] == 0xFF && (p_data[1] & 0xF2) == 0xF0 )
+{
+pid->probed.i_fourcc = VLC_CODEC_MP4A; /* ADTS */
+pid->probed.i_original_fourcc = VLC_FOURCC('A','D','T','S');
+}
 }
 /* VIDEO STREAM */
 else if( i_stream_id >= 0xE0 && i_stream_id <= 0xEF )
@@ -323,6 +328,7 @@ void MissingPATPMTFixup( demux_t *p_demux )
 continue;
 
 es_format_Init([j].fmt, p_pid->probed.i_cat, 
p_pid->probed.i_fourcc);
+esstreams[j].fmt.i_original_fourcc = 
p_pid->probed.i_original_fourcc;
 
 if( VLC_SUCCESS !=
 FillPMTESParams(mux_standard, [j].fmt, 
[j].ts, [j].pes ) )
diff --git a/modules/demux/mpeg/ts_pid.h b/modules/demux/mpeg/ts_pid.h
index c61256ae09..6103768fa3 100644
--- a/modules/demux/mpeg/ts_pid.h
+++ b/modules/demux/mpeg/ts_pid.h
@@ -72,6 +72,7 @@ struct ts_pid_t
 struct
 {
 vlc_fourcc_t i_fourcc;
+vlc_fourcc_t i_original_fourcc;
 int i_cat;
 int i_pcr_count;
 uint8_t i_stream_id;

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

[vlc-commits] demux: adaptive: keep new decoders deselected state

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 16 
22:29:29 2018 +0200| [5066a19f0a819c00e90a90e792397fc6a09eaa47] | committer: 
Francois Cartegnie

demux: adaptive: keep new decoders deselected state

refs #20436

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

 modules/demux/adaptive/plumbing/FakeESOut.cpp | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp 
b/modules/demux/adaptive/plumbing/FakeESOut.cpp
index 73b39954b9..017e857ed8 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -119,6 +119,7 @@ void FakeESOut::createOrRecycleRealEsID( FakeESOutID *es_id 
)
 
 vlc_mutex_lock();
 
+bool b_preexisting = false;
 bool b_select = false;
 for( it=recycle_candidates.begin(); it!=recycle_candidates.end(); ++it )
 {
@@ -133,6 +134,7 @@ void FakeESOut::createOrRecycleRealEsID( FakeESOutID *es_id 
)
 }
 else if( cand->getFmt()->i_cat == es_id->getFmt()->i_cat && 
cand->realESID() )
 {
+b_preexisting = true;
 /* We need to enforce same selection when not reused
Otherwise the es will select any other compatible track
and will end this in a activate/select loop when reactivating a 
track */
@@ -143,9 +145,16 @@ void FakeESOut::createOrRecycleRealEsID( FakeESOutID 
*es_id )
 
 if( !realid )
 {
-realid = es_out_Add( real_es_out, es_id->getFmt() );
-if( b_select )
+es_format_t fmt;
+es_format_Copy( , es_id->getFmt() );
+if( b_preexisting && !b_select ) /* was not previously selected on 
other format */
+fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
+else
+fmt.i_priority = ES_PRIORITY_SELECTABLE_MIN;
+realid = es_out_Add( real_es_out,  );
+if( b_preexisting && b_select ) /* was previously selected on other 
format */
 es_out_Control( real_es_out, ES_OUT_SET_ES, realid );
+es_format_Clean(  );
 }
 
 es_id->setRealESID( realid );

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

[vlc-commits] contrib: x265: do not copy .pdb files that don't exist

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Fri May 18 16:32:17 
2018 +0200| [61a022426778489a73eb5cd85591a904e513820e] | committer: Steve Lhomme

contrib: x265: do not copy .pdb files that don't exist

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

 contrib/src/x265/rules.mak |  1 +
 contrib/src/x265/x265-no-pdb-install.patch | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index cf53f52718..01859b99b3 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -27,6 +27,7 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
mkdir -p $@-$(X265_VERSION)
tar xvjf "$<" --strip-components=1 -C $@-$(X265_VERSION)
$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
+   $(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
$(call pkg_static,"source/x265.pc.in")
 ifndef HAVE_WIN32
$(APPLY) $(SRC)/x265/x265-pkg-libs.patch
diff --git a/contrib/src/x265/x265-no-pdb-install.patch 
b/contrib/src/x265/x265-no-pdb-install.patch
new file mode 100644
index 00..38ed618ecd
--- /dev/null
+++ b/contrib/src/x265/x265-no-pdb-install.patch
@@ -0,0 +1,11 @@
+--- x265/source/CMakeLists.txt.nopdb   2018-05-18 16:28:43.150790700 +0200
 x265/source/CMakeLists.txt 2018-05-18 16:28:53.838634400 +0200
+@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+ endif()
+ install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION 
include)
+-if(WIN32)
++if(WIN32 AND MSVC_IDE)
+ if(MSVC_IDE)
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION 
${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" 
DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)

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

[vlc-commits] Contribs: update libdsm to 0.3.0

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Fri 
May 18 15:06:46 2018 +0200| [a579e5026543841d6030c30b3db811b50fcc686a] | 
committer: Thomas Guillem

Contribs: update libdsm to 0.3.0

(cherry picked from commit 31f77d71aff16e35926c9e54385f36e89f2fddad)
Signed-off-by: Thomas Guillem 

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

 ...netbios-use-time-instead-of-clock_gettime.patch | 68 --
 contrib/src/libdsm/SHA512SUMS  |  2 +-
 contrib/src/libdsm/rules.mak   |  3 +-
 3 files changed, 2 insertions(+), 71 deletions(-)

diff --git 
a/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch 
b/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch
deleted file mode 100644
index c55edc13cc..00
--- a/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9bebdc7ba3da352269ff5b92a2eb568756a3105d Mon Sep 17 00:00:00 2001
-From: Thomas Guillem 
-Date: Mon, 12 Feb 2018 10:46:51 +0100
-Subject: [PATCH] netbios: use time() instead of clock_gettime()
-
-We don't need more than second precisions and this function is available on
-more platforms.

- src/netbios_ns.c | 11 +--
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/netbios_ns.c b/src/netbios_ns.c
-index ff37c55..89992ee 100644
 a/src/netbios_ns.c
-+++ b/src/netbios_ns.c
-@@ -831,7 +831,6 @@ static void *netbios_ns_discover_thread(void *opaque)
- netbios_ns *ns = (netbios_ns *) opaque;
- while (true)
- {
--struct timespec tp;
- const int remove_timeout = 5 * ns->discover_broadcast_timeout;
- netbios_ns_entry  *entry, *entry_next;
- 
-@@ -840,12 +839,12 @@ static void *netbios_ns_discover_thread(void *opaque)
- 
- // check if cached entries timeout, the timeout value is 5 times the
- // broadcast timeout.
--clock_gettime(CLOCK_REALTIME, );
-+time_t now = time(NULL);
- for (entry = TAILQ_FIRST(>entry_queue);
-  entry != NULL; entry = entry_next)
- {
- entry_next = TAILQ_NEXT(entry, next);
--if (tp.tv_sec - entry->last_time_seen > remove_timeout)
-+if (now - entry->last_time_seen > remove_timeout)
- {
- if (entry->flag & NS_ENTRY_FLAG_VALID_NAME)
- {
-@@ -886,7 +885,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (res == 0)
- break;
- 
--clock_gettime(CLOCK_REALTIME, );
-+time_t now = time(NULL);
- 
- if (name_query.type == NAME_QUERY_TYPE_NB)
- {
-@@ -899,7 +898,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (!entry)
- return NULL;
- }
--entry->last_time_seen = tp.tv_sec;
-+entry->last_time_seen = now;
- 
- // if entry is already valid, don't send NBSTAT query
- if (entry->flag & NS_ENTRY_FLAG_VALID_NAME)
-@@ -922,7 +921,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (!entry)
- continue;
- 
--entry->last_time_seen = tp.tv_sec;
-+entry->last_time_seen = now;
- 
- send_callback = !(entry->flag & NS_ENTRY_FLAG_VALID_NAME);
- 
--- 
-2.11.0
-
diff --git a/contrib/src/libdsm/SHA512SUMS b/contrib/src/libdsm/SHA512SUMS
index 48454b57dc..bb3a29cbb8 100644
--- a/contrib/src/libdsm/SHA512SUMS
+++ b/contrib/src/libdsm/SHA512SUMS
@@ -1 +1 @@
-461162010679926baa49027ceecc0fd2565ded37384290494f9511372dd51d053857585dc12d7f93451ee209f60555cc07619e881e6eaff667879ff4285f6254
  libdsm-0.2.8.tar.gz
+8a26a4b14ad64b55f830d39641c0879639b2086f9e5cb8d4b6b83314a778844303e4c491aafd98362a9b5ec3eaab9fe7a4cfd5580b055d93553b69b68cdece4a
  libdsm-0.3.0.tar.gz
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index cd37bb6e2e..69b5420cd0 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -1,7 +1,7 @@
 # libdsm
 
 #LIBDSM_GITURL := git://github.com/videolabs/libdsm.git
-LIBDSM_VERSION := 0.2.8
+LIBDSM_VERSION := 0.3.0
 LIBDSM_URL := 
https://github.com/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"libdsm >= 0.2.0"),)
@@ -20,7 +20,6 @@ endif
 
 libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(UNPACK)
-   $(APPLY) 
$(SRC)/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch
$(MOVE)
 
 DEPS_libdsm = libtasn1 iconv

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

[vlc-commits] contrib: libdsm: use the pkg-static helper.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov  | Sun 
Feb 11 14:43:13 2018 +0300| [026cc4c41b03fa9142d53afaabe46431a5a6a71e] | 
committer: Thomas Guillem

contrib: libdsm: use the pkg-static helper.

(cherry picked from commit 2dad37de6d895646d52a11ba5c0506c83009089b)
Signed-off-by: Thomas Guillem 

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

 contrib/src/libdsm/rules.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 9ef10cf840..cd37bb6e2e 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -27,5 +27,7 @@ DEPS_libdsm = libtasn1 iconv
 
 .libdsm: libdsm
cd $< && $(HOSTVARS) ./configure --disable-programs $(LIBDSM_CONF)
+   cd $< && $(MAKE)
+   cd $< && ../../../contrib/src/pkg-static.sh libdsm.pc
cd $< && $(MAKE) install
touch $@

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

[vlc-commits] packetizer: hevc: workaround sps vui broken bitstream

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri May 
18 13:50:57 2018 +0200| [3dc29f024080d853642f0b01380789096ead09ed] | committer: 
Thomas Guillem

packetizer: hevc: workaround sps vui broken bitstream

more wtf in the wild

(cherry picked from commit d8686ad223752f4b8abcf3ace5a2c77af7bb14ea)
Signed-off-by: Thomas Guillem 

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

 modules/packetizer/hevc_nal.c | 26 +-
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index e4f68afa23..0e044b75fb 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -435,7 +435,8 @@ static bool hevc_parse_scaling_list_rbsp( bs_t *p_bs )
 return true;
 }
 
-static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, hevc_vui_parameters_t 
*p_vui )
+static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, hevc_vui_parameters_t 
*p_vui,
+bool b_broken )
 {
 if( bs_remain( p_bs ) < 10 )
 return false;
@@ -486,7 +487,7 @@ static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, 
hevc_vui_parameters_t *p
 p_vui->field_seq_flag = bs_read1( p_bs );
 p_vui->frame_field_info_present_flag = bs_read1( p_bs );
 
-p_vui->default_display_window_flag = bs_read1( p_bs );
+p_vui->default_display_window_flag = !b_broken && bs_read1( p_bs );
 if( p_vui->default_display_window_flag )
 {
 p_vui->def_disp.win_left_offset = bs_read_ue( p_bs );
@@ -895,9 +896,24 @@ static bool hevc_parse_sequence_parameter_set_rbsp( bs_t 
*p_bs,
 return false;
 
 p_sps->vui_parameters_present_flag = bs_read1( p_bs );
-if( p_sps->vui_parameters_present_flag &&
-!hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui ) )
-return false;
+if( p_sps->vui_parameters_present_flag )
+{
+bs_t rollbackpoint = *p_bs;
+if( !hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui, false ) &&
+p_sps->vui.default_display_window_flag &&
+bs_remain( p_bs ) < 66 )
+{
+/* Broken MKV SPS vui bitstreams with missing display_window bits.
+ * Forced to accept it since some decided to accept it...
+ * see https://trac.ffmpeg.org/ticket/6644
+ * Might break decoders since cropping & clock rate have totally
+ * funky values when decoded properly */
+*p_bs = rollbackpoint;
+memset( _sps->vui, 0, sizeof(p_sps->vui) );
+if( !hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui, true ) )
+return false;
+}
+}
 
 /* incomplete */
 

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

[vlc-commits] contrib: goom: don't build the xmmx code that is not used

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Fri May 18 15:05:58 
2018 +0200| [8d47f6b5faff28fbb2f934669cbf48b2da93319f] | committer: Steve Lhomme

contrib: goom: don't build the xmmx code that is not used

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

 contrib/src/goom/goom2k4-noxmmx.patch | 17 +
 1 file changed, 17 insertions(+)

diff --git a/contrib/src/goom/goom2k4-noxmmx.patch 
b/contrib/src/goom/goom2k4-noxmmx.patch
index d9f07a2ce4..5525cc6cab 100644
--- a/contrib/src/goom/goom2k4-noxmmx.patch
+++ b/contrib/src/goom/goom2k4-noxmmx.patch
@@ -18,3 +18,20 @@
  #ifdef VERBOSE
printf ("MMX detected. Using fast methods !\n");
  #endif
+--- goom/src/xmmx.c.no-xmmx2005-02-07 14:46:41.0 +0100
 goom/src/xmmx.c2018-05-18 15:04:47.031571100 +0200
+@@ -26,6 +26,7 @@ int xmmx_supported (void) {
+   return (mm_support()&0x8)>>3;
+ }
+ 
++#if 0
+ void zoom_filter_xmmx (int prevX, int prevY,
+Pixel *expix1, Pixel *expix2,
+int *lbruS, int *lbruD, int buffratio,
+@@ -389,5 +390,5 @@ void draw_line_xmmx (Pixel *data, int x1
+ end_of_line:
+   __asm__ __volatile__ ("femms\n"); 
+ }
+-
++#endif /* 0 */
+ #endif

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

[vlc-commits] Contribs: update libdsm to 0.3.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf  | Fri May 18 
15:06:46 2018 +0200| [31f77d71aff16e35926c9e54385f36e89f2fddad] | committer: 
Jean-Baptiste Kempf

Contribs: update libdsm to 0.3.0

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

 ...netbios-use-time-instead-of-clock_gettime.patch | 68 --
 .../0001-pkg-config-don-t-hardcode-liconv.patch| 23 
 contrib/src/libdsm/SHA512SUMS  |  2 +-
 contrib/src/libdsm/rules.mak   |  4 +-
 4 files changed, 2 insertions(+), 95 deletions(-)

diff --git 
a/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch 
b/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch
deleted file mode 100644
index c55edc13cc..00
--- a/contrib/src/libdsm/0001-netbios-use-time-instead-of-clock_gettime.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9bebdc7ba3da352269ff5b92a2eb568756a3105d Mon Sep 17 00:00:00 2001
-From: Thomas Guillem 
-Date: Mon, 12 Feb 2018 10:46:51 +0100
-Subject: [PATCH] netbios: use time() instead of clock_gettime()
-
-We don't need more than second precisions and this function is available on
-more platforms.

- src/netbios_ns.c | 11 +--
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/netbios_ns.c b/src/netbios_ns.c
-index ff37c55..89992ee 100644
 a/src/netbios_ns.c
-+++ b/src/netbios_ns.c
-@@ -831,7 +831,6 @@ static void *netbios_ns_discover_thread(void *opaque)
- netbios_ns *ns = (netbios_ns *) opaque;
- while (true)
- {
--struct timespec tp;
- const int remove_timeout = 5 * ns->discover_broadcast_timeout;
- netbios_ns_entry  *entry, *entry_next;
- 
-@@ -840,12 +839,12 @@ static void *netbios_ns_discover_thread(void *opaque)
- 
- // check if cached entries timeout, the timeout value is 5 times the
- // broadcast timeout.
--clock_gettime(CLOCK_REALTIME, );
-+time_t now = time(NULL);
- for (entry = TAILQ_FIRST(>entry_queue);
-  entry != NULL; entry = entry_next)
- {
- entry_next = TAILQ_NEXT(entry, next);
--if (tp.tv_sec - entry->last_time_seen > remove_timeout)
-+if (now - entry->last_time_seen > remove_timeout)
- {
- if (entry->flag & NS_ENTRY_FLAG_VALID_NAME)
- {
-@@ -886,7 +885,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (res == 0)
- break;
- 
--clock_gettime(CLOCK_REALTIME, );
-+time_t now = time(NULL);
- 
- if (name_query.type == NAME_QUERY_TYPE_NB)
- {
-@@ -899,7 +898,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (!entry)
- return NULL;
- }
--entry->last_time_seen = tp.tv_sec;
-+entry->last_time_seen = now;
- 
- // if entry is already valid, don't send NBSTAT query
- if (entry->flag & NS_ENTRY_FLAG_VALID_NAME)
-@@ -922,7 +921,7 @@ static void *netbios_ns_discover_thread(void *opaque)
- if (!entry)
- continue;
- 
--entry->last_time_seen = tp.tv_sec;
-+entry->last_time_seen = now;
- 
- send_callback = !(entry->flag & NS_ENTRY_FLAG_VALID_NAME);
- 
--- 
-2.11.0
-
diff --git a/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch 
b/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch
deleted file mode 100644
index 5cc76e033b..00
--- a/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 284587e66a58f70fc1875306ccd077643c6c076d Mon Sep 17 00:00:00 2001
-From: Konstantin Pavlov 
-Date: Sun, 11 Feb 2018 14:56:38 +0300
-Subject: [PATCH] pkg-config: don't hardcode -liconv.
-
-It's not available everywhere.

- libdsm.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdsm.pc.in b/libdsm.pc.in
-index df022d5..cc9b22a 100644
 a/libdsm.pc.in
-+++ b/libdsm.pc.in
-@@ -8,4 +8,4 @@ Description: Minimalist and read-only smb client library
- Version: @BDSM_PACKAGE_VERSION@
- Cflags: -I${includedir} @PTHREAD_CFLAGS@
- Libs: -L${libdir} -ldsm
--Libs.private: -liconv -ltasn1 @PTHREAD_LIBS@ @BDSM_LIB_LOG@ @SOCKET_LIBS@
-+Libs.private: @LIBICONV@ -ltasn1 @PTHREAD_LIBS@ @BDSM_LIB_LOG@ @SOCKET_LIBS@
--- 
-2.14.3 (Apple Git-98)
-
diff --git a/contrib/src/libdsm/SHA512SUMS b/contrib/src/libdsm/SHA512SUMS
index 48454b57dc..bb3a29cbb8 100644
--- a/contrib/src/libdsm/SHA512SUMS
+++ b/contrib/src/libdsm/SHA512SUMS
@@ -1 +1 @@
-461162010679926baa49027ceecc0fd2565ded37384290494f9511372dd51d053857585dc12d7f93451ee209f60555cc07619e881e6eaff667879ff4285f6254
  libdsm-0.2.8.tar.gz

[vlc-commits] demux: ts: weaken topfield probing, rely on sync code only

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri May 
18 10:07:47 2018 +0200| [517fab832eed218e96ed187ad1182887ee3efcf7] | committer: 
Jean-Baptiste Kempf

demux: ts: weaken topfield probing, rely on sync code only

probed value does not work with non sat recordings

(cherry picked from commit 6eb4e888122c813f975046054ca11d91c415b006)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/demux/mpeg/ts.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index e3ff94e277..f7c87a8531 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -265,8 +265,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
  _peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX )
 return -1;
 
-if( memcmp( p_peek, "TFrc", 4 ) == 0 &&
-p_peek[6] == 0 && ((GetDWBE(_peek[53]) & 0x7F00U) == 0x00) &&
+if( memcmp( p_peek, "TFrc", 4 ) == 0 && p_peek[6] == 0 &&
 vlc_stream_Peek( p_demux->s, _peek, TOPFIELD_HEADER_SIZE + 
TS_PACKET_SIZE_MAX )
 == TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
 {
@@ -277,7 +276,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
 msg_Dbg( p_demux, "this is a topfield file" );
 #if 0
 /* I used the TF5000PVR 2004 Firmware .doc header documentation,
- * 
http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
+ * 
/doc/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc 
on streams.vo
  * but after the filename the offsets seem to be incorrect.  - DJ 
*/
 int i_duration, i_name;
 char *psz_name = xmalloc(25);

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

[vlc-commits] packetizer: hevc: workaround sps vui broken bitstream

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Fri May 18 
13:50:57 2018 +0200| [d8686ad223752f4b8abcf3ace5a2c77af7bb14ea] | committer: 
Francois Cartegnie

packetizer: hevc: workaround sps vui broken bitstream

more wtf in the wild

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

 modules/packetizer/hevc_nal.c | 26 +-
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index 8e649b93ee..970aed526e 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -437,7 +437,8 @@ static bool hevc_parse_scaling_list_rbsp( bs_t *p_bs )
 return true;
 }
 
-static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, hevc_vui_parameters_t 
*p_vui )
+static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, hevc_vui_parameters_t 
*p_vui,
+bool b_broken )
 {
 if( bs_remain( p_bs ) < 10 )
 return false;
@@ -488,7 +489,7 @@ static bool hevc_parse_vui_parameters_rbsp( bs_t *p_bs, 
hevc_vui_parameters_t *p
 p_vui->field_seq_flag = bs_read1( p_bs );
 p_vui->frame_field_info_present_flag = bs_read1( p_bs );
 
-p_vui->default_display_window_flag = bs_read1( p_bs );
+p_vui->default_display_window_flag = !b_broken && bs_read1( p_bs );
 if( p_vui->default_display_window_flag )
 {
 p_vui->def_disp.win_left_offset = bs_read_ue( p_bs );
@@ -897,9 +898,24 @@ static bool hevc_parse_sequence_parameter_set_rbsp( bs_t 
*p_bs,
 return false;
 
 p_sps->vui_parameters_present_flag = bs_read1( p_bs );
-if( p_sps->vui_parameters_present_flag &&
-!hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui ) )
-return false;
+if( p_sps->vui_parameters_present_flag )
+{
+bs_t rollbackpoint = *p_bs;
+if( !hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui, false ) &&
+p_sps->vui.default_display_window_flag &&
+bs_remain( p_bs ) < 66 )
+{
+/* Broken MKV SPS vui bitstreams with missing display_window bits.
+ * Forced to accept it since some decided to accept it...
+ * see https://trac.ffmpeg.org/ticket/6644
+ * Might break decoders since cropping & clock rate have totally
+ * funky values when decoded properly */
+*p_bs = rollbackpoint;
+memset( _sps->vui, 0, sizeof(p_sps->vui) );
+if( !hevc_parse_vui_parameters_rbsp( p_bs, _sps->vui, true ) )
+return false;
+}
+}
 
 /* incomplete */
 

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

[vlc-commits] Contribs: move harfbuzz to CMake

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Fri 
May 18 12:43:50 2018 +0200| [eed275e5060d7349162462163d011f98ea3da115] | 
committer: Jean-Baptiste Kempf

Contribs: move harfbuzz to CMake

(cherry picked from commit c1147c576b3c8be44c1e8081c3be196cb7c84193)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/harfbuzz/rules.mak | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index a7ffab6442..3ccdcc7ca5 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -20,15 +20,15 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
 
 harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
-.harfbuzz: harfbuzz
-   cd $< && env NOCONFIGURE=1 sh autogen.sh
-   cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)" ./configure $(HOSTCONF) 
$(HARFBUZZCONF)
-   cd $< && $(MAKE) install
+.harfbuzz: harfbuzz toolchain.cmake
+   cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
+   -DBUILD_SHARED_LIBS:BOOL=OFF \
+   .. && $(MAKE)
+   cd $< && cd build && $(MAKE) install
touch $@

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

[vlc-commits] gl: android: remove duplicate check and set b_locked flag

[Zhao Zhili]

vlc | branch: master | Zhao Zhili  | Thu May 17 
20:22:28 2018 +0800| [9e83c78fcdb037e3714496018e434d687e56ee4c] | committer: 
Thomas Guillem

gl: android: remove duplicate check and set b_locked flag

Make it as the same style as PoolUnlockOpaquePicture in android/display.

Signed-off-by: Thomas Guillem 

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

 modules/video_output/opengl/converter_android.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/opengl/converter_android.c 
b/modules/video_output/opengl/converter_android.c
index c196c2873b..ad0265f4b1 100644
--- a/modules/video_output/opengl/converter_android.c
+++ b/modules/video_output/opengl/converter_android.c
@@ -55,11 +55,8 @@ static void
 pool_unlock_pic(picture_t *p_pic)
 {
 picture_sys_t *p_picsys = p_pic->p_sys;
-if (p_picsys->b_locked)
-{
-AndroidOpaquePicture_Release(p_picsys, false);
-p_picsys->b_locked  = false;
-}
+
+AndroidOpaquePicture_Release(p_picsys, false);
 }
 
 static int

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

[vlc-commits] posix: silence a unused variable warning

[Zhao Zhili]

vlc | branch: master | Zhao Zhili  | Fri May 18 
14:00:53 2018 +0800| [7ce8aee5374eba7f281eafe7523ffdc71563e705] | committer: 
Thomas Guillem

posix: silence a unused variable warning

Signed-off-by: Thomas Guillem 

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

 src/posix/plugin.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/posix/plugin.c b/src/posix/plugin.c
index 65db4ee702..f2a259e0dd 100644
--- a/src/posix/plugin.c
+++ b/src/posix/plugin.c
@@ -45,8 +45,10 @@ void *vlc_dlopen(const char *path, bool lazy)
 const int flags = lazy ? RTLD_LAZY : RTLD_NOW;
 #elif defined (DL_LAZY)
 const int flags = DL_LAZY;
+VLC_UNUSED(lazy);
 #else
 const int flags = 0;
+VLC_UNUSED(lazy);
 #endif
 return dlopen (path, flags);
 }

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

[vlc-commits] gl: android: fix memory leak and error code

[Zhao Zhili]

vlc | branch: master | Zhao Zhili  | Thu May 17 
20:22:29 2018 +0800| [270255bcdf9fd40456c3ddf1a0e8ab171b22c0ec] | committer: 
Thomas Guillem

gl: android: fix memory leak and error code

Signed-off-by: Thomas Guillem 

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

 modules/video_output/opengl/converter_android.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/converter_android.c 
b/modules/video_output/opengl/converter_android.c
index ad0265f4b1..2e89544b24 100644
--- a/modules/video_output/opengl/converter_android.c
+++ b/modules/video_output/opengl/converter_android.c
@@ -264,7 +264,10 @@ Open(vlc_object_t *obj)
 
 char *code;
 if (asprintf(, template, tc->glsl_version, tc->glsl_precision_header) 
< 0)
-return 0;
+{
+free(tc->priv);
+return VLC_EGENERIC;
+}
 GLuint fragment_shader = tc->vt->CreateShader(GL_FRAGMENT_SHADER);
 tc->vt->ShaderSource(fragment_shader, 1, (const char **) , NULL);
 tc->vt->CompileShader(fragment_shader);

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

[vlc-commits] opengl: add comment

[Thomas Guillem]

vlc | branch: master | Thomas Guillem  | Fri May 18 13:26:49 
2018 +0200| [ac8e185dda7ca6f68677b53e4ea0a977a121c160] | committer: Thomas 
Guillem

opengl: add comment

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

 modules/video_output/opengl/converter_sw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/video_output/opengl/converter_sw.c 
b/modules/video_output/opengl/converter_sw.c
index d609468cd2..6676879a1d 100644
--- a/modules/video_output/opengl/converter_sw.c
+++ b/modules/video_output/opengl/converter_sw.c
@@ -139,6 +139,8 @@ pbo_picture_create(const opengl_tex_converter_t *tc, bool 
direct_rendering)
 picsys->gl = tc->gl;
 vlc_gl_Hold(picsys->gl);
 }
+
+/* XXX: needed since picture_NewFromResource override pic planes */
 if (picture_Setup(pic, >fmt))
 {
 picture_Release(pic);

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

[vlc-commits] sap: silence signedness warnings

[Zhao Zhili]

vlc | branch: master | Zhao Zhili  | Fri May 18 
14:00:54 2018 +0800| [b7b0199708783df3ecd93d193e09ac4359a7935a] | committer: 
Thomas Guillem

sap: silence signedness warnings

Signed-off-by: Thomas Guillem 

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

 src/stream_output/sap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 2b5b0e13a2..e81bb00ec4 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -192,13 +192,13 @@ sout_AnnounceRegisterSDP (vlc_object_t *obj, const char 
*sdp,
 
 if (vlc_getaddrinfo (dst, 0, NULL, ) == 0)
 {
-if (res->ai_addrlen <= sizeof (addr))
+if ((size_t)res->ai_addrlen <= sizeof (addr))
 memcpy (, res->ai_addr, res->ai_addrlen);
 addrlen = res->ai_addrlen;
 freeaddrinfo (res);
 }
 
-if (addrlen == 0 || addrlen > sizeof (addr))
+if (addrlen == 0 || (size_t)addrlen > sizeof (addr))
 {
 msg_Err (obj, "No/invalid address specified for SAP announce" );
 return NULL;

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

[vlc-commits] src/android: implement config_GetSysPath

[Zhao Zhili]

vlc | branch: master | Zhao Zhili  | Fri May 18 
14:00:52 2018 +0800| [32567e5d9d7426875190e59acf4a45404afbfca3] | committer: 
Thomas Guillem

src/android: implement config_GetSysPath

Signed-off-by: Thomas Guillem 

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

 src/android/specific.c | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/src/android/specific.c b/src/android/specific.c
index bb45f28e16..c8a0e6756e 100644
--- a/src/android/specific.c
+++ b/src/android/specific.c
@@ -302,6 +302,29 @@ char *config_GetUserDir (vlc_userdir_t type)
 return NULL;
 }
 
+char *config_GetSysPath(vlc_sysdir_t type, const char *filename)
+{
+char *dir = NULL;
+
+switch (type)
+{
+case VLC_LIB_DIR:
+dir = config_GetLibDir();
+break;
+default:
+break;
+}
+
+if (filename == NULL || dir == NULL)
+return dir;
+
+char *path;
+if (unlikely(asprintf(, "%s/%s", dir, filename) == -1))
+path = NULL;
+free(dir);
+return path;
+}
+
 /**
  * Determines the network proxy server to use (if any).
  *

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

[vlc-commits] Contribs: move harfbuzz to CMake

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf  | Fri May 18 
12:43:50 2018 +0200| [c1147c576b3c8be44c1e8081c3be196cb7c84193] | committer: 
Jean-Baptiste Kempf

Contribs: move harfbuzz to CMake

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

 contrib/src/harfbuzz/rules.mak | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 01ee97718b..3ccdcc7ca5 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -20,15 +20,15 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
 
 harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(UNPACK)
-   $(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
-.harfbuzz: harfbuzz
-   cd $< && env NOCONFIGURE=1 sh autogen.sh
-   cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(HARFBUZZCONF)
-   cd $< && $(MAKE) install
+.harfbuzz: harfbuzz toolchain.cmake
+   cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
+   -DBUILD_SHARED_LIBS:BOOL=OFF \
+   .. && $(MAKE)
+   cd $< && cd build && $(MAKE) install
touch $@

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

[vlc-commits] mlp: missing initializer (fixes #20494)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Fri May 18 
12:43:03 2018 +0300| [3667d57baf436a46e2afb47e843bac0b8922be82] | committer: 
Rémi Denis-Courmont

mlp: missing initializer (fixes #20494)

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

 modules/packetizer/mlp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index ab78068ad5..365d483ed9 100644
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -481,6 +481,7 @@ static int Open( vlc_object_t *p_this )
 
 /* */
 p_sys->i_state = STATE_NOSYNC;
+date_Init( _sys->end_date, 1, 1 );
 date_Set( _sys->end_date, VLC_TS_INVALID );
 
 block_BytestreamInit( _sys->bytestream );

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

[vlc-commits] logger/console: print messages in system locale on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun  | Thu May 10 21:41:47 
2018 +0900| [0adb6dc67ab563f14347bdad6eb2cce3d27432a7] | committer: Thomas 
Guillem

logger/console: print messages in system locale on OS/2

Signed-off-by: Thomas Guillem 

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

 modules/logger/console.c | 33 +
 1 file changed, 33 insertions(+)

diff --git a/modules/logger/console.c b/modules/logger/console.c
index 14627479c9..39d71489ad 100644
--- a/modules/logger/console.c
+++ b/modules/logger/console.c
@@ -34,6 +34,33 @@
 static const int ptr_width = 2 * /* hex digits */ sizeof (uintptr_t);
 static const char msg_type[4][9] = { "", " error", " warning", " debug" };
 
+#ifdef __OS2__
+#include 
+
+static int OS2ConsoleOutput(FILE *stream, const char *format, va_list ap)
+{
+char *msg;
+char *os2msg;
+
+if (vasprintf(, format, ap) == -1 )
+return -1;
+
+if ((os2msg = ToLocale(msg)) == NULL)
+{
+free(msg);
+
+return -1;
+}
+
+fputs(os2msg, stream);
+
+LocaleFree(os2msg);
+free(msg);
+
+return 0;
+}
+#endif
+
 #ifndef _WIN32
 # define COL(x,y) "\033[" #x ";" #y "m"
 # define RED  COL(31,1)
@@ -59,6 +86,9 @@ static void LogConsoleColor(void *opaque, int type, const 
vlc_log_t *meta,
 fprintf(stream, "[%s] ", meta->psz_header);
 fprintf(stream, "%s %s%s: %s", meta->psz_module, meta->psz_object_type,
 msg_type[type], msg_color[type]);
+#ifdef __OS2__
+if (OS2ConsoleOutput(stream, format, ap) == -1)
+#endif
 vfprintf(stream, format, ap);
 fputs(GRAY"\n", stream);
 funlockfile(stream);
@@ -80,6 +110,9 @@ static void LogConsoleGray(void *opaque, int type, const 
vlc_log_t *meta,
 fprintf(stream, "[%s] ", meta->psz_header);
 fprintf(stream, "%s %s%s: ", meta->psz_module, meta->psz_object_type,
 msg_type[type]);
+#ifdef __OS2__
+if (OS2ConsoleOutput(stream, format, ap) == -1)
+#endif
 vfprintf(stream, format, ap);
 putc_unlocked('\n', stream);
 funlockfile(stream);

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

[vlc-commits] os2: implement vlc_once()

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun  | Thu May 10 21:41:46 
2018 +0900| [94756f160c776300c9f72290dbf5864fad9021d4] | committer: Thomas 
Guillem

os2: implement vlc_once()

Signed-off-by: Thomas Guillem 

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

 include/vlc_threads.h |  6 ++
 src/os2/thread.c  | 28 
 2 files changed, 34 insertions(+)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 508ddbc001..b0891ac88c 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -125,6 +125,12 @@ typedef struct
 #define VLC_STATIC_COND { NULLHANDLE, 0, NULLHANDLE, 0 }
 #define LIBVLC_NEED_SEMAPHORE
 #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;
 
diff --git a/src/os2/thread.c b/src/os2/thread.c
index 42dba0aa10..e4afb5bbe2 100644
--- a/src/os2/thread.c
+++ b/src/os2/thread.c
@@ -429,6 +429,34 @@ int vlc_cond_timedwait_daytime (vlc_cond_t *p_condvar, 
vlc_mutex_t *p_mutex,
 return vlc_cond_wait_common (p_condvar, p_mutex, ulTimeout);
 }
 
+void vlc_once(vlc_once_t *once, void (*cb)(void))
+{
+unsigned done;
+
+/* load once->done */
+__atomic_xchg( , once->done );
+
+/* not initialized ? */
+if( done == 0 )
+{
+vlc_mutex_lock( >mutex );
+
+/* load once->done */
+__atomic_xchg( , once->done );
+
+/* still not initialized ? */
+if( done == 0 )
+{
+cb();
+
+/* set once->done to 1 */
+__atomic_xchg( >done, 1 );
+}
+
+vlc_mutex_unlock( >mutex );
+}
+}
+
 /*** Thread-specific variables (TLS) ***/
 struct vlc_threadvar
 {

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

[vlc-commits] demux: ts: weaken topfield probing, rely on sync code only

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Fri May 18 
10:07:47 2018 +0200| [6eb4e888122c813f975046054ca11d91c415b006] | committer: 
Francois Cartegnie

demux: ts: weaken topfield probing, rely on sync code only

probed value does not work with non sat recordings

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

 modules/demux/mpeg/ts.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 35a21aa6a7..1cc1ec5ee5 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -265,8 +265,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
  _peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX )
 return -1;
 
-if( memcmp( p_peek, "TFrc", 4 ) == 0 &&
-p_peek[6] == 0 && ((GetDWBE(_peek[53]) & 0x7F00U) == 0x00) &&
+if( memcmp( p_peek, "TFrc", 4 ) == 0 && p_peek[6] == 0 &&
 vlc_stream_Peek( p_demux->s, _peek, TOPFIELD_HEADER_SIZE + 
TS_PACKET_SIZE_MAX )
 == TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
 {
@@ -277,7 +276,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, 
unsigned *pi_header_
 msg_Dbg( p_demux, "this is a topfield file" );
 #if 0
 /* I used the TF5000PVR 2004 Firmware .doc header documentation,
- * 
http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
+ * 
/doc/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc 
on streams.vo
  * but after the filename the offsets seem to be incorrect.  - DJ 
*/
 int i_duration, i_name;
 char *psz_name = xmalloc(25);

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

[vlc-commits] xcb: fix module name

[Rémi Denis-Courmont]

vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont  | Thu May 
17 20:59:25 2018 +0300| [78fa32737306640e2efb183cf112ad76dbc56de1] | committer: 
Rémi Denis-Courmont

xcb: fix module name

(cherry picked from commit a9476564afbb66e3ef28e6a8e398fe36819e5ef8)
Signed-off-by: Rémi Denis-Courmont 

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

 modules/video_output/xcb/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/xcb/events.c 
b/modules/video_output/xcb/events.c
index 8584bf2fe2..16ff8cbaee 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -34,7 +34,7 @@
 
 #include "events.h"
 
-const char vlc_module_name[] = "vlcpulse";
+const char vlc_module_name[] = "xcb";
 
 #pragma GCC visibility push(default)
 

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

[vlc-commits] xcb: fix module name

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Thu May 17 
20:59:25 2018 +0300| [a9476564afbb66e3ef28e6a8e398fe36819e5ef8] | committer: 
Rémi Denis-Courmont

xcb: fix module name

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

 modules/video_output/xcb/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/xcb/events.c 
b/modules/video_output/xcb/events.c
index 8584bf2fe2..16ff8cbaee 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -34,7 +34,7 @@
 
 #include "events.h"
 
-const char vlc_module_name[] = "vlcpulse";
+const char vlc_module_name[] = "xcb";
 
 #pragma GCC visibility push(default)
 

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