date:20171012

[vlc-commits] display: add more documentation for display_info.handle_mouse_hide

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Tue Aug  8 15:22:31 
2017 +0200| [10216c788dc302d9d6709efbb216fd92657a55e6] | committer: 
Jean-Baptiste Kempf

display: add more documentation for display_info.handle_mouse_hide

In all cases this flag means that the vout has a custom Window and handles the
mouse event itself, including showing/hiding the mouse.

For the auto-hiding to work such vout need to call either
vout_display_SendEventMouseMoved or vout_display_SendEventMouseState to notify
the core of mouse events. And they all do that.

Signed-off-by: Jean-Baptiste Kempf 

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

 include/vlc_vout_display.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index e612bac48c..80761c8762 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -128,7 +128,9 @@ typedef struct {
 typedef struct {
 bool is_slow;   /* The picture memory has slow 
read/write */
 bool has_double_click;  /* Is double-click generated */
-bool needs_hide_mouse;  /* Needs VOUT_DISPLAY_HIDE_MOUSE */
+bool needs_hide_mouse;  /* Needs VOUT_DISPLAY_HIDE_MOUSE,
+ * needs to call 
vout_display_SendEventMouseMoved()
+ * or 
vout_display_SendEventMouseState() */
 bool has_pictures_invalid;  /* Will 
VOUT_DISPLAY_EVENT_PICTURES_INVALID be used */
 const vlc_fourcc_t *subpicture_chromas; /* List of supported chromas for 
subpicture rendering. */
 } vout_display_info_t;

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

[vlc-commits] os2: package: enable libass and fribidi

2017-10-12 Thread KO Myung-Hun

vlc/vlc-2.2 | branch: master | KO Myung-Hun  | Wed Aug  9 
19:44:02 2017 +0900| [7a7bd82ec944786faee56dc76522da18f20ecf15] | committer: 
Jean-Baptiste Kempf

os2: package: enable libass and fribidi

Signed-off-by: Jean-Baptiste Kempf 

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

 extras/package/os2/configure.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/package/os2/configure.sh b/extras/package/os2/configure.sh
index 7328249c4c..72d52135c1 100644
--- a/extras/package/os2/configure.sh
+++ b/extras/package/os2/configure.sh
@@ -27,10 +27,11 @@ OPTIONS="
   --enable-vorbis
   --enable-png
   --enable-x264
+  --enable-libass
   --disable-xcb
   --disable-xvideo
   --enable-freetype
-  --disable-fribidi
+  --enable-fribidi
   --enable-fontconfig
   --enable-kva
   --enable-kai

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

[vlc-commits] logger/file: Improve the verbosity option description

2017-10-12 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Fri Sep  8 21:49:33 
2017 +0200| [fc05351f4f53fc24a0e92b61134018e0b492ae2a] | committer: 
Jean-Baptiste Kempf

logger/file: Improve the verbosity option description

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/modules/logger/file.c b/modules/logger/file.c
index 89058d95bd..48c0d8c45e 100644
--- a/modules/logger/file.c
+++ b/modules/logger/file.c
@@ -212,7 +212,7 @@ static const char *const verbosity_text[] = { 
N_("Default"), N_("Info"), N_("Err
 #define LOGMODE_LONGTEXT N_("Specify the logging format.")
 
 #define LOGVERBOSE_TEXT N_("Verbosity")
-#define LOGVERBOSE_LONGTEXT N_("Select the verbosity to use for log or " \
+#define LOGVERBOSE_LONGTEXT N_("Select the logging verbosity or " \
 "default to use the same verbosity given by --verbose.")
 
 vlc_module_begin()

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

[vlc-commits] logger/file: Use defines for logfile text and longtext

2017-10-12 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Fri Sep  8 21:49:34 
2017 +0200| [e597583b00f6327cb31bb14d0705526376363ebb] | committer: 
Jean-Baptiste Kempf

logger/file: Use defines for logfile text and longtext

Make it consistent with the rest of the options text and longtexts

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/modules/logger/file.c b/modules/logger/file.c
index ff7962497b..89058d95bd 100644
--- a/modules/logger/file.c
+++ b/modules/logger/file.c
@@ -205,6 +205,9 @@ static const char *const verbosity_text[] = { 
N_("Default"), N_("Info"), N_("Err
 #define FILE_LOG_TEXT N_("Log to file")
 #define FILE_LOG_LONGTEXT N_("Log all VLC messages to a text file.")
 
+#define LOGFILE_NAME_TEXT N_("Log filename")
+#define LOGFILE_NAME_LONGTEXT N_("Specify the log filename.")
+
 #define LOGMODE_TEXT N_("Log format")
 #define LOGMODE_LONGTEXT N_("Specify the logging format.")
 
@@ -222,7 +225,7 @@ vlc_module_begin()
 
 add_bool("file-logging", false, FILE_LOG_TEXT, FILE_LOG_LONGTEXT, false)
 add_savefile("logfile", NULL,
- N_("Log filename"), N_("Specify the log filename."), false)
+ LOGFILE_NAME_TEXT, LOGFILE_NAME_LONGTEXT, false)
 add_string("logmode", "text", LOGMODE_TEXT, LOGMODE_LONGTEXT, false)
 change_string_list(mode_list, mode_list_text)
 add_integer("log-verbose", -1, LOGVERBOSE_TEXT, LOGVERBOSE_LONGTEXT, false)

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

[vlc-commits] qt/pref: fix toolbar icon or text beeing cropped on Hi-DPI displays

2017-10-12 Thread Pierre Lamot

vlc | branch: master | Pierre Lamot  | Wed Sep 13 11:45:26 
2017 +0200| [32930aa2e0c72371d4865a1ef18a0bab460be40a] | committer: 
Jean-Baptiste Kempf

qt/pref: fix toolbar icon or text beeing cropped on Hi-DPI displays

Qt doesn't seems to handle properly when QIcon within QToolButton doesn't
 respect the original image ratio.

 This might results in icons beeing cropped on Linux or text beeing cropped
 on windows.

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/qt/components/simple_preferences.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp 
b/modules/gui/qt/components/simple_preferences.cpp
index 9ae0b6ad6e..ca458dd17a 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -198,7 +198,8 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, 
QWidget *_parent ) :
 button->setText( label );   \
 button->setToolTip( ltooltip ); \
 button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );  \
-button->setIconSize( QSize( icon_height + 40 , icon_height ) ); \
+button->setIconSize( QSize( icon_height, icon_height ) );   \
+button->setMinimumSize( QSize( icon_height + 40, icon_height + 40 ) );  \
 button->setSizePolicy(QSizePolicy::MinimumExpanding, 
QSizePolicy::Minimum); \
 button->setAutoRaise( true );   \
 button->setCheckable( true );   \

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

[vlc-commits] video_output: fix disabled log compilation

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Sep 14 15:01:08 
2017 +0200| [88643985d4d54c176ce22a6e7718051b1bf211d7] | committer: 
Jean-Baptiste Kempf

video_output: fix disabled log compilation

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 10e1d87c26..12539768db 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1090,7 +1090,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t 
*vout, bool is_forced)
 
 /* Wait the real date (for rendering jitter) */
 #if 0
-mtime_t delay = direct->date - mdate();
+mtime_t delay = todisplay->date - mdate();
 if (delay < 1000)
 msg_Warn(vout, "picture is late (%lld ms)", delay / 1000);
 #endif

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

[vlc-commits] avcodec: "avcodec-skip-frame" is read once into i_skip_frame

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Sep 14 15:02:09 
2017 +0200| [57954251e6a8bf91192eeaf380e00775cab96c28] | committer: 
Jean-Baptiste Kempf

avcodec: "avcodec-skip-frame" is read once into i_skip_frame

p_context->skip_frame is the value that may change during decoding

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/codec/avcodec/video.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index e24319169e..501618fb8f 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -497,13 +497,13 @@ int InitVideoDec( vlc_object_t *obj )
 p_sys->b_show_corrupted = var_CreateGetBool( p_dec, "avcodec-corrupted" );
 
 i_val = var_CreateGetInteger( p_dec, "avcodec-skip-frame" );
-if( i_val >= 4 ) p_context->skip_frame = AVDISCARD_ALL;
-else if( i_val == 3 ) p_context->skip_frame = AVDISCARD_NONKEY;
-else if( i_val == 2 ) p_context->skip_frame = AVDISCARD_BIDIR;
-else if( i_val == 1 ) p_context->skip_frame = AVDISCARD_NONREF;
-else if( i_val == -1 ) p_context->skip_frame = AVDISCARD_NONE;
-else p_context->skip_frame = AVDISCARD_DEFAULT;
-p_sys->i_skip_frame = p_context->skip_frame;
+if( i_val >= 4 ) p_sys->i_skip_frame = AVDISCARD_ALL;
+else if( i_val == 3 ) p_sys->i_skip_frame = AVDISCARD_NONKEY;
+else if( i_val == 2 ) p_sys->i_skip_frame = AVDISCARD_BIDIR;
+else if( i_val == 1 ) p_sys->i_skip_frame = AVDISCARD_NONREF;
+else if( i_val == -1 ) p_sys->i_skip_frame = AVDISCARD_NONE;
+else p_sys->i_skip_frame = AVDISCARD_DEFAULT;
+p_context->skip_frame = p_sys->i_skip_frame;
 
 i_val = var_CreateGetInteger( p_dec, "avcodec-skip-idct" );
 if( i_val >= 4 ) p_context->skip_idct = AVDISCARD_ALL;

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

[vlc-commits] avcodec: remove useless initialization

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Sep 14 15:01:32 
2017 +0200| [bea939de13f986a74eeb6425b1c57f6c207c6863] | committer: 
Jean-Baptiste Kempf

avcodec: remove useless initialization

The value is never used before it's set to mdate()

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/codec/avcodec/video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 501618fb8f..e1457154b9 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -886,7 +886,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t 
**pp_block, bool *error
 
 
 block_t *p_block;
-mtime_t current_time = VLC_TS_INVALID;
+mtime_t current_time;
 
 if( !p_context->extradata_size && p_dec->fmt_in.i_extra )
 {

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

[vlc-commits] Skins2: fix typo

2017-10-12 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Fri Oct 13 
00:50:14 2017 +0200| [4c1092bd2652a05ea4f0b7aa20c6478e84fc5567] | committer: 
Jean-Baptiste Kempf

Skins2: fix typo

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

 modules/gui/skins2/src/vlcproc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/skins2/src/vlcproc.cpp 
b/modules/gui/skins2/src/vlcproc.cpp
index b827637e60..e10240bb7b 100644
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -178,7 +178,7 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf 
),
 var_Create( pIntf, "interaction", VLC_VAR_ADDRESS );
 var_AddCallback( pIntf, "interaction", onInteraction, this );
 
-// initialize variables refering to liblvc and playlist objects
+// initialize variables refering to libvlc and playlist objects
 init_variables();
 }
 

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

[vlc-commits] activex: add option to set video scale factor

2017-10-12 Thread Pierre Lamot

npapi-vlc | branch: master | Pierre Lamot  | Thu Oct  5 
19:24:18 2017 +0200| [6ee39ead04f52ffe83b24457cd4f429122a81911] | committer: 
Jean-Baptiste Kempf

activex: add option to set video scale factor

Similar to libvlc_video_set_scale

Signed-off-by: Jean-Baptiste Kempf 

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

 activex/axvlc.idl   |  5 +
 activex/vlccontrol2.cpp | 15 +++
 activex/vlccontrol2.h   |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/activex/axvlc.idl b/activex/axvlc.idl
index 9202ab2..5eb3822 100644
--- a/activex/axvlc.idl
+++ b/activex/axvlc.idl
@@ -513,6 +513,11 @@ library AXVLC
 [propput, helpstring("Sets video aspect ratio.")]
 HRESULT aspectRatio([in] BSTR aspect);
 
+[propget, helpstring("Returns video scale.")]
+HRESULT scale([out, retval] float* aspect);
+[propput, helpstring("Sets video scale.")]
+HRESULT scale([in] float aspect);
+
 [propget, helpstring("Returns video subtitle used.")]
 HRESULT subtitle([out, retval] long* spu);
 [propput, helpstring("Sets video subtitle to use.")]
diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index b8c3bb3..ec20618 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -1109,6 +1109,21 @@ STDMETHODIMP VLCVideo::put_aspectRatio(BSTR aspect)
 return S_OK;
 }
 
+STDMETHODIMP VLCVideo::get_scale(float* scale)
+{
+if( NULL == scale )
+return E_POINTER;
+
+*scale = _plug->get_player().get_mp().scale();
+return S_OK;
+}
+
+STDMETHODIMP VLCVideo::put_scale(float scale)
+{
+_plug->get_player().get_mp().setScale( scale );
+return S_OK;
+}
+
 STDMETHODIMP VLCVideo::get_subtitle(long* spu)
 {
 if( NULL == spu )
diff --git a/activex/vlccontrol2.h b/activex/vlccontrol2.h
index 2a9bfc5..db6c52e 100644
--- a/activex/vlccontrol2.h
+++ b/activex/vlccontrol2.h
@@ -345,6 +345,8 @@ public:
 STDMETHODIMP get_height(long*);
 STDMETHODIMP get_aspectRatio(BSTR*);
 STDMETHODIMP put_aspectRatio(BSTR);
+STDMETHODIMP get_scale(float*);
+STDMETHODIMP put_scale(float);
 STDMETHODIMP get_subtitle(long*);
 STDMETHODIMP put_subtitle(long);
 STDMETHODIMP get_crop(BSTR*);

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

[vlc-commits] [Git][videolan/npapi-vlc][master] activex: add option to set video scale factor

2017-10-12 Thread Jean-Baptiste Kempf

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


Commits:
6ee39ead by Pierre Lamot at 2017-10-13T00:03:49+02:00
activex: add option to set video scale factor

Similar to libvlc_video_set_scale

Signed-off-by: Jean-Baptiste Kempf 

- - - - -


3 changed files:

- activex/axvlc.idl
- activex/vlccontrol2.cpp
- activex/vlccontrol2.h


Changes:

=
activex/axvlc.idl
=
--- a/activex/axvlc.idl
+++ b/activex/axvlc.idl
@@ -513,6 +513,11 @@ library AXVLC
 [propput, helpstring("Sets video aspect ratio.")]
 HRESULT aspectRatio([in] BSTR aspect);
 
+[propget, helpstring("Returns video scale.")]
+HRESULT scale([out, retval] float* aspect);
+[propput, helpstring("Sets video scale.")]
+HRESULT scale([in] float aspect);
+
 [propget, helpstring("Returns video subtitle used.")]
 HRESULT subtitle([out, retval] long* spu);
 [propput, helpstring("Sets video subtitle to use.")]


=
activex/vlccontrol2.cpp
=
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -1109,6 +1109,21 @@ STDMETHODIMP VLCVideo::put_aspectRatio(BSTR aspect)
 return S_OK;
 }
 
+STDMETHODIMP VLCVideo::get_scale(float* scale)
+{
+if( NULL == scale )
+return E_POINTER;
+
+*scale = _plug->get_player().get_mp().scale();
+return S_OK;
+}
+
+STDMETHODIMP VLCVideo::put_scale(float scale)
+{
+_plug->get_player().get_mp().setScale( scale );
+return S_OK;
+}
+
 STDMETHODIMP VLCVideo::get_subtitle(long* spu)
 {
 if( NULL == spu )


=
activex/vlccontrol2.h
=
--- a/activex/vlccontrol2.h
+++ b/activex/vlccontrol2.h
@@ -345,6 +345,8 @@ public:
 STDMETHODIMP get_height(long*);
 STDMETHODIMP get_aspectRatio(BSTR*);
 STDMETHODIMP put_aspectRatio(BSTR);
+STDMETHODIMP get_scale(float*);
+STDMETHODIMP put_scale(float);
 STDMETHODIMP get_subtitle(long*);
 STDMETHODIMP put_subtitle(long);
 STDMETHODIMP get_crop(BSTR*);



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

---
View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/commit/6ee39ead04f52ffe83b24457cd4f429122a81911
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] Contribs: add support for QtSVG for Qt

2017-10-12 Thread Pierre Lamot

vlc | branch: master | Pierre Lamot  | Fri Sep 29 10:25:03 
2017 +0200| [189ca8feb6c784101a879895e8ad7cd793a0f16c] | committer: 
Jean-Baptiste Kempf

Contribs: add support for QtSVG for Qt

Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/qt/rules.mak   |  3 +-
 .../0001-Force-the-usage-of-QtZlib-header.patch| 29 ++
 contrib/src/qtsvg/SHA512SUMS   |  1 +
 contrib/src/qtsvg/rules.mak| 34 ++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 3a3ff05c3b..d8b2196f57 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -60,7 +60,7 @@ endif
mkdir -p $(PREFIX)/include/QtGui/qpa
cp 
$(PREFIX)/include/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h 
$(PREFIX)/include/QtGui/qpa
# Clean Qt mess
-   rm -rf $(PREFIX)/lib/libQt5Bootstrap* $(PREFIX)/lib/*.prl 
$(PREFIX)/mkspecs
+   rm -rf $(PREFIX)/lib/libQt5Bootstrap*
# Fix .pc files to remove debug version (d)
cd $(PREFIX)/lib/pkgconfig; for i in Qt5Core.pc Qt5Gui.pc 
Qt5Widgets.pc; do sed -i -e 's/d\.a/.a/g' -e 's/d $$/ /' $$i; done
# Fix Qt5Gui.pc file to include qwindows (QWindowsIntegrationPlugin) 
and Qt5Platform Support
@@ -69,6 +69,7 @@ ifdef HAVE_CROSS_COMPILE
# Building Qt build tools for Xcompilation
cd $
+Date: Thu, 21 Sep 2017 12:05:15 +0200
+Subject: [PATCH] Force the usage of QtZlib header
+
+  qmake adds -I$(PREFIX)/include before adding
+  -I$(PREFIX)/include/QtZlib in its path while cross
+  compiling which ends up using the definition from the
+  system zlib while linking to QtZlib
+---
+ src/svg/qsvgtinydocument.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
+index cc0fd5d..450c2d1 100644
+--- a/src/svg/qsvgtinydocument.cpp
 b/src/svg/qsvgtinydocument.cpp
+@@ -45,7 +45,7 @@
+ #include "qdebug.h"
+ 
+ #ifndef QT_NO_COMPRESS
+-#include 
++#include 
+ #endif
+ 
+ QT_BEGIN_NAMESPACE
+-- 
+2.14.1
+
diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
new file mode 100644
index 00..0edeff3a5e
--- /dev/null
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -0,0 +1 @@
+ff78a75d0452de56dfe5b33f64d611c9e75e1a46c2ca168f9d3467ef3bb32f17ef256b45df275ed45bc2215d31dbf321d9cacb3f428096354041481276683958
  qtsvg-5.6.2.tar.xz
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
new file mode 100644
index 00..924f6efca7
--- /dev/null
+++ b/contrib/src/qtsvg/rules.mak
@@ -0,0 +1,34 @@
+# Qt
+
+QTSVG_VERSION := 5.6.2
+QTSVG_URL := 
https://download.qt.io/official_releases/qt/5.6/$(QTSVG_VERSION)/submodules/qtsvg-opensource-src-$(QTSVG_VERSION).tar.xz
+
+DEPS_qtsvg += qt $(DEPS_qt)
+
+ifeq ($(call need_pkg,"Qt5Svg"),)
+PKGS_FOUND += qtsvg
+endif
+
+$(TARBALLS)/qtsvg-$(QTSVG_VERSION).tar.xz:
+   $(call download,$(QTSVG_URL))
+
+.sum-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz
+
+qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
+   $(UNPACK)
+   mv qtsvg-opensource-src-$(QTSVG_VERSION) qtsvg-$(QTSVG_VERSION)
+   $(APPLY) $(SRC)/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
+   $(MOVE)
+
+.qtsvg: qtsvg
+   cd $< && $(PREFIX)/bin/qmake
+   # Make && Install libraries
+   cd $< && $(MAKE)
+   cd $https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: add support for QtSVG

2017-10-12 Thread Pierre Lamot

vlc | branch: master | Pierre Lamot  | Thu Oct 12 23:57:57 
2017 +0200| [25751de829d4169e109ad60247e8aa02c7931b73] | committer: 
Jean-Baptiste Kempf

Qt: add support for QtSVG

Signed-off-by: Jean-Baptiste Kempf 

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

 configure.ac  | 2 +-
 modules/gui/qt/qt.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f342b328da..19f80b8608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3655,7 +3655,7 @@ AC_ARG_ENABLE(qt, [
 ])
 have_qt5_x11="no"
 AS_IF([test "${enable_qt}" != "no"], [
-  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.2.0 Qt5Widgets Qt5Gui], [
+  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.6.0 Qt5Widgets Qt5Gui Qt5Svg], [
   PKG_CHECK_MODULES([QT5_X11], [Qt5X11Extras], [
   have_qt5_x11="yes"
   ],[
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index f521d04171..914671aa1e 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -56,6 +56,8 @@
  #if HAS_QT5
   #ifdef QT_STATICPLUGIN
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+   Q_IMPORT_PLUGIN(QSvgIconPlugin)
+   Q_IMPORT_PLUGIN(QSvgPlugin)
#if !HAS_QT56
 Q_IMPORT_PLUGIN(AccessibleFactory)
#endif

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

[vlc-commits] direct3d11: bring back the Flush

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Tue Oct 10 14:40:15 
2017 +0200| [da7bd76e91dce3a8cbfb847fe651879b4e5ab78b] | committer: 
Jean-Baptiste Kempf

direct3d11: bring back the Flush

It does help to get the processing going during Prepare() and before Display()

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 32615c8549..b8241f3df4 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1405,7 +1405,7 @@ static void Prepare(vout_display_t *vd, picture_t 
*picture, subpicture_t *subpic
 IDXGISwapChain4_SetHDRMetaData(sys->dxgiswapChain4, 
DXGI_HDR_METADATA_TYPE_HDR10, sizeof(hdr10), &hdr10);
 }
 
-//ID3D11DeviceContext_Flush(sys->d3dcontext);
+ID3D11DeviceContext_Flush(sys->d3dcontext);
 }
 
 static void Display(vout_display_t *vd, picture_t *picture, subpicture_t 
*subpicture)

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

[vlc-commits] direct3d11: Add one more buffer to the SwapChain

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Tue Oct 10 14:40:16 
2017 +0200| [3cd51996e440b66572480d6ebc94126a702b7012] | committer: 
Jean-Baptiste Kempf

direct3d11: Add one more buffer to the SwapChain

It helps the GPU when one buffer is being processed for display and another
being displayed.

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index aa0d0b9cd8..32615c8549 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1671,7 +1671,7 @@ static int Direct3D11Open(vout_display_t *vd, 
video_format_t *fmt)
 
 DXGI_SWAP_CHAIN_DESC1 scd;
 memset(&scd, 0, sizeof(scd));
-scd.BufferCount = 2;
+scd.BufferCount = 3;
 scd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
 scd.SampleDesc.Count = 1;
 scd.SampleDesc.Quality = 0;

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

[vlc-commits] direct3d11: disable display luminance detection

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Oct 12 11:29:58 
2017 +0200| [2cc670ba6ece2e4faf391ee0bb5b00f3dca6a900] | committer: 
Jean-Baptiste Kempf

direct3d11: disable display luminance detection

It doesn't work well with our current way of tone mapping and adjusting the
luminance between the source and output.

Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 445c177135..aa0d0b9cd8 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1606,7 +1606,7 @@ done:
 }
 
 msg_Dbg(vd, "Output max luminance: %.1f, colorspace %s, bits 
per pixel %d", desc1.MaxFullFrameLuminance, csp?csp->name:"unknown", 
desc1.BitsPerColor);
-sys->display.luminance_peak = desc1.MaxFullFrameLuminance;
+//sys->display.luminance_peak = desc1.MaxFullFrameLuminance;
 }
 IDXGIOutput6_Release( dxgiOutput6 );
 }

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

[vlc-commits] directx_va: add an extra buffer when decoding MPEG-2

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Oct 12 12:00:59 
2017 +0200| [6eabd69cde982a3aef89e63894ba2b6f68f8220a] | committer: 
Jean-Baptiste Kempf

directx_va: add an extra buffer when decoding MPEG-2

DXVA2 with deinterlacing seems to be using one of these buffers when it 
shouldn't

Fixes #18731

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

 modules/codec/avcodec/directx_va.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/directx_va.c 
b/modules/codec/avcodec/directx_va.c
index 1f51e4c227..e35c6856e2 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -299,7 +299,7 @@ int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, 
const AVCodecContext *
 /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
but it causes issues for H.264 on certain AMD GPUs. */
 surface_alignment = 32;
-surface_count += 2;
+surface_count += 2 + 1; /* 1 for extra buffer for deinterlacing */
 break;
 case AV_CODEC_ID_HEVC:
 /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure

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

[vlc-commits] mmal: Link to core, components, util explicitly

2017-10-12 Thread Julian Scheel

vlc | branch: master | Julian Scheel  | Thu Oct 12 14:47:06 
2017 +0200| [1857a476b3f2f8ecb8fcd9668ae8b82c6facbb5b] | committer: 
Jean-Baptiste Kempf

mmal: Link to core, components, util explicitly

In older versions of the rpi-userland libmmal was linked against
libmmal_core/_components/_util, so they were linked implicitly. Newer
versions don't do that, so we have to link them explicitly.

Signed-off-by: Julian Scheel 
Signed-off-by: Jean-Baptiste Kempf 

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

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

diff --git a/configure.ac b/configure.ac
index 0f8f69f1a3..f342b328da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3379,7 +3379,7 @@ if test "${enable_mmal}" != "no"; then
 VLC_ADD_PLUGIN([mmal])
 VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ])
 VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem 
/opt/vc/include/interface/vcos/pthreads -isystem 
/opt/vc/include/interface/vmcs_host/linux ])
-VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lvchostif ]) ], [
+VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components 
-lmmal_util -lvchostif ]) ], [
   AS_IF([test "${enable_mmal}" = "yes"],
 [ AC_MSG_ERROR([Cannot find bcm library...]) ],
 [ AC_MSG_WARN([Cannot find bcm library...]) ])

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

[vlc-commits] dxgi_fmt: add some common formats that may be supported

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Oct 12 12:56:20 
2017 +0200| [3d3dadcf4c34f1bf44000f2c640285d3666cb0ea] | committer: 
Jean-Baptiste Kempf

dxgi_fmt: add some common formats that may be supported

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/video_chroma/dxgi_fmt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index bacf329cac..7e1b60cee0 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -55,10 +55,12 @@ static const dxgi_format_t dxgi_formats[] = {
 { "B5G6R5",  DXGI_FORMAT_B5G6R5_UNORM,VLC_CODEC_RGB16},
 { "Y416",DXGI_FORMAT_Y416,0  },
 { "P010",DXGI_FORMAT_P010,VLC_CODEC_P010 },
+{ "P016",DXGI_FORMAT_P016,0  },
 { "Y210",DXGI_FORMAT_Y210,VLC_CODEC_YUYV }, /* 
AV_PIX_FMT_YUYV422 */
 { "Y410",DXGI_FORMAT_Y410,0  },
 { "NV11",DXGI_FORMAT_NV11,0  },
 { "RGB10A2", DXGI_FORMAT_R10G10B10A2_UNORM,   0  },
+{ "RGB16",   DXGI_FORMAT_R16G16B16A16_UNORM,  0  },
 { "RGB16_FLOAT", DXGI_FORMAT_R16G16B16A16_FLOAT,  0  },
 { "UNKNOWN", DXGI_FORMAT_UNKNOWN, 0  },
 

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

[vlc-commits] d3d11va: use the external pool texture size even for the internal pool

2017-10-12 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Thu Oct 12 15:53:34 
2017 +0200| [532ca7722383ff2cde69d7b7cc4c4e8f21aa404b] | committer: 
Jean-Baptiste Kempf

d3d11va: use the external pool texture size even for the internal pool

When it's available, so that pre-computed dimensions still match as if the
pictures were coming from the external pool.

Fixes #18578

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/codec/avcodec/d3d11va.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index be9b649ddd..f95174e5bc 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -385,6 +385,11 @@ static int Open(vlc_va_t *va, AVCodecContext *ctx, enum 
PixelFormat pix_fmt,
 va->sys->totalTextureSlices = dstDesc.ArraySize;
 }
 }
+if (!va->sys->textureWidth || !va->sys->textureHeight)
+{
+va->sys->textureWidth  = fmt->video.i_width;
+va->sys->textureHeight = fmt->video.i_height;
+}
 
 #if VLC_WINSTORE_APP
 err = directx_va_Open(va, &sys->dx_sys, false);
@@ -861,8 +866,8 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int 
codec_id,
 {
 D3D11_TEXTURE2D_DESC texDesc;
 ZeroMemory(&texDesc, sizeof(texDesc));
-texDesc.Width = fmt->i_width;
-texDesc.Height = fmt->i_height;
+texDesc.Width = sys->textureWidth;
+texDesc.Height = sys->textureHeight;
 texDesc.MipLevels = 1;
 texDesc.Format = sys->render;
 texDesc.SampleDesc.Count = 1;

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

[vlc-commits] mmal: Include headers with -isystem

2017-10-12 Thread Julian Scheel

vlc | branch: master | Julian Scheel  | Thu Oct 12 14:47:05 
2017 +0200| [3571a4d399aa6cd5eb11a76cf74eb23566a35050] | committer: 
Jean-Baptiste Kempf

mmal: Include headers with -isystem

The vcos/mmal headers are vendor provided system headers.

Signed-off-by: Julian Scheel 
Signed-off-by: Jean-Baptiste Kempf 

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

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 442f74f159..0f8f69f1a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3372,13 +3372,13 @@ AC_ARG_ENABLE(mmal,
 if test "${enable_mmal}" != "no"; then
   VLC_SAVE_FLAGS
   LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif"
-  CPPFLAGS="${CPPFLAGS} -I/opt/vc/include 
-I/opt/vc/include/interface/vcos/pthreads 
-I/opt/vc/include/interface/vmcs_host/linux"
+  CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem 
/opt/vc/include/interface/vcos/pthreads -isystem 
/opt/vc/include/interface/vmcs_host/linux"
   AC_CHECK_HEADERS(interface/mmal/mmal.h,
 [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [
 have_mmal="yes"
 VLC_ADD_PLUGIN([mmal])
 VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ])
-VLC_ADD_CFLAGS([mmal],[ -I/opt/vc/include 
-I/opt/vc/include/interface/vcos/pthreads 
-I/opt/vc/include/interface/vmcs_host/linux ])
+VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem 
/opt/vc/include/interface/vcos/pthreads -isystem 
/opt/vc/include/interface/vmcs_host/linux ])
 VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lvchostif ]) ], [
   AS_IF([test "${enable_mmal}" = "yes"],
 [ AC_MSG_ERROR([Cannot find bcm library...]) ],

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

[vlc-commits] libvlc: hide "extractor-flatten" option

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 17:14:35 
2017 +0200| [aea0b966eac77f91f0fab8aceef880175255e1aa] | committer: Thomas 
Guillem

libvlc: hide "extractor-flatten" option

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

 src/libvlc-module.c | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 7e1d90be15..15939f4a19 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1138,11 +1138,6 @@ static const char *const psz_recursive_list_text[] = {
 #define SHOW_HIDDENFILES_LONGTEXT N_( \
 "Ignore files starting with '.'" )
 
-#define EXTRACTOR_FLATTEN_TEXT N_( \
-"Flatten files listed by extractors (archive)")
-#define EXTRACTOR_FLATTEN_LONGTEXT N_( \
-"The default behavior is to create one item per directory.")
-
 #define SD_TEXT N_( "Services discovery modules")
 #define SD_LONGTEXT N_( \
  "Specifies the services discovery modules to preload, separated by " \
@@ -2105,7 +2100,8 @@ vlc_module_begin ()
 add_bool( "show-hiddenfiles", false,
   SHOW_HIDDENFILES_TEXT, SHOW_HIDDENFILES_LONGTEXT, false )
 add_bool( "extractor-flatten", false,
-  EXTRACTOR_FLATTEN_TEXT, EXTRACTOR_FLATTEN_LONGTEXT, true );
+  "Flatten files listed by extractors (archive)", NULL, true )
+change_volatile()
 
 set_subcategory( SUBCAT_PLAYLIST_SD )
 add_string( "services-discovery", "", SD_TEXT, SD_LONGTEXT, true )

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

[vlc-commits] VT: only use hw decoding unless explicitely requested

2017-10-12 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Thu Oct 12 
17:16:16 2017 +0200| [eaf8fd5e3910ca2fc3ec7176f3e6619fff2d3f96] | committer: 
Jean-Baptiste Kempf

VT: only use hw decoding unless explicitely requested

Close #18911

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

 modules/codec/videotoolbox.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index f460f56133..7b4524566c 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -85,7 +85,7 @@ set_capability("video decoder",800)
 set_callbacks(OpenDecoder, CloseDecoder)
 
 add_bool("videotoolbox-temporal-deinterlacing", true, VT_TEMPO_DEINTERLACE, 
VT_TEMPO_DEINTERLACE_LONG, false)
-add_bool("videotoolbox-hw-decoder-only", false, VT_REQUIRE_HW_DEC, 
VT_REQUIRE_HW_DEC, false)
+add_bool("videotoolbox-hw-decoder-only", true, VT_REQUIRE_HW_DEC, 
VT_REQUIRE_HW_DEC, false)
 add_string("videotoolbox-cvpx-chroma", "", VT_FORCE_CVPX_CHROMA, 
VT_FORCE_CVPX_CHROMA_LONG, true);
 vlc_module_end()
 

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

[vlc-commits] hls: uint8_t is available in the global namespace

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:48:00 2017 +0200| [4ab384a7d77f568006dc782fe80eccec60f49942] | committer: 
Hugo Beauzée-Luyssen

hls: uint8_t is available in the global namespace

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

 modules/demux/hls/playlist/M3U8.cpp | 8 
 modules/demux/hls/playlist/M3U8.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/hls/playlist/M3U8.cpp 
b/modules/demux/hls/playlist/M3U8.cpp
index 1d2ec2b5ac..cbdb2ff660 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -45,12 +45,12 @@ M3U8::~M3U8()
 vlc_mutex_destroy(&keystore_lock);
 }
 
-std::vector M3U8::getEncryptionKey(const std::string &uri)
+std::vector M3U8::getEncryptionKey(const std::string &uri)
 {
-std::vector key;
+std::vector key;
 
 vlc_mutex_lock( &keystore_lock );
-std::map>::iterator it = 
keystore.find(uri);
+std::map >::iterator it = 
keystore.find(uri);
 if(it == keystore.end())
 {
 /* Pretty bad inside the lock */
@@ -61,7 +61,7 @@ std::vector M3U8::getEncryptionKey(const 
std::string &uri)
 {
 key.resize(16);
 memcpy(&key[0], p_block->p_buffer, 16);
-keystore.insert(std::pair>(uri, key));
+keystore.insert(std::pair 
>(uri, key));
 }
 block_Release(p_block);
 }
diff --git a/modules/demux/hls/playlist/M3U8.hpp 
b/modules/demux/hls/playlist/M3U8.hpp
index 4f656e5f17..95398994c8 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -37,14 +37,14 @@ namespace hls
 M3U8(vlc_object_t *);
 virtual ~M3U8();
 
-std::vector   getEncryptionKey(const 
std::string &);
+std::vectorgetEncryptionKey(const 
std::string &);
 virtual boolisLive() const;
 virtual voiddebug();
 
 private:
 std::string data;
 vlc_mutex_t keystore_lock;
-std::map> keystore;
+std::map > keystore;
 };
 }
 }

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

[vlc-commits] taglib: Don't use qualified name lookup on unscoped enumeration

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:44:55 2017 +0200| [280986ab30c9957e5b5d4388c7743952ae696609] | committer: 
Hugo Beauzée-Luyssen

taglib: Don't use qualified name lookup on unscoped enumeration

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

 modules/meta_engine/taglib.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 2cb4f826ab..123d09c94f 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -130,7 +130,7 @@ File *VLCTagLib::ExtResolver::createFile(FileName 
fileName, bool, AudioProper
 std::string fext = filename.substr(namesize - ext.length(), 
ext.length());
 std::transform(fext.begin(), fext.end(), fext.begin(), ::toupper);
 if(fext == ext)
-return new T(fileName, false, AudioProperties::ReadStyle::Fast);
+return new T(fileName, false, AudioProperties::Fast);
 }
 
 return 0;

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

[vlc-commits] core: video_output: Remove unused include

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:44:05 2017 +0200| [ab85d7f11ed8a7dff0a692e5d4ae369c28247304] | committer: 
Hugo Beauzée-Luyssen

core: video_output: Remove unused include

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

 src/video_output/display.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 3a6bba01dc..1160354522 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 #include 
-#include 
 
 #include 
 #include 

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

[vlc-commits] vlc_fixups: Provide __STDC_*_MACROS when building C++ for NACL

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:00:57 2017 +0200| [04bf5ab8ebe84c1f76bc0baa42246960a2f272ee] | committer: 
Hugo Beauzée-Luyssen

vlc_fixups: Provide __STDC_*_MACROS when building C++ for NACL

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

 include/vlc_fixups.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index eb0eb17278..4888b782be 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -33,7 +33,7 @@
 
 /* C++11 says there's no need to define __STDC_*_MACROS when including
  * inttypes.h and stdint.h. */
-#if defined (__cplusplus) && (defined(__MINGW32__) || defined(__UCLIBC__))
+#if defined (__cplusplus) && (defined(__MINGW32__) || defined(__UCLIBC__) || 
defined(__native_client__))
 # ifndef __STDC_FORMAT_MACROS
 #  define __STDC_FORMAT_MACROS 1
 # endif

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

[vlc-commits] adaptive: Don't use qualified name lookup on unscoped enumerations

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:10:32 2017 +0200| [92ab073fc37225a1d31e9a4375d4c20415d9dc74] | committer: 
Hugo Beauzée-Luyssen

adaptive: Don't use qualified name lookup on unscoped enumerations

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

 modules/demux/adaptive/playlist/SegmentInformation.cpp | 2 +-
 modules/demux/hls/playlist/Representation.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp 
b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index e8bdb752f2..8d5a7fe3ae 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -422,7 +422,7 @@ bool 
SegmentInformation::getPlaybackTimeDurationBySegmentNumber(uint64_t number,
 else
 {
 const Timescale timescale = inheritTimescale();
-const ISegment *segment = getSegment(SegmentInfoType::INFOTYPE_MEDIA, 
number);
+const ISegment *segment = getSegment(INFOTYPE_MEDIA, number);
 if( segment )
 {
 *time = timescale.ToTime(segment->startTime.Get());
diff --git a/modules/demux/hls/playlist/Representation.cpp 
b/modules/demux/hls/playlist/Representation.cpp
index f1d64dbd09..f920acc631 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -160,7 +160,7 @@ uint64_t Representation::translateSegmentNumber(uint64_t 
num, const SegmentInfor
 {
 if(consistentSegmentNumber())
 return num;
-ISegment *fromSeg = from->getSegment(SegmentInfoType::INFOTYPE_MEDIA, num);
+ISegment *fromSeg = from->getSegment(INFOTYPE_MEDIA, num);
 HLSSegment *fromHlsSeg = dynamic_cast(fromSeg);
 if(!fromHlsSeg)
 return 1;
@@ -168,7 +168,7 @@ uint64_t Representation::translateSegmentNumber(uint64_t 
num, const SegmentInfor
 
 std::vector list;
 std::vector::const_iterator it;
-getSegments(SegmentInfoType::INFOTYPE_MEDIA, list);
+getSegments(INFOTYPE_MEDIA, list);
 for(it=list.begin(); it != list.end(); ++it)
 {
 const HLSSegment *hlsSeg = dynamic_cast(*it);

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

[vlc-commits] adaptive: playlist: Remove explicit invocation of default contructor

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:02:38 2017 +0200| [153132b4cfc743a23172db7c67cee2057bfd61a9] | committer: 
Hugo Beauzée-Luyssen

adaptive: playlist: Remove explicit invocation of default contructor

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

 modules/demux/adaptive/playlist/SegmentBase.cpp   | 4 +---
 modules/demux/adaptive/playlist/SegmentInfoCommon.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/demux/adaptive/playlist/SegmentBase.cpp 
b/modules/demux/adaptive/playlist/SegmentBase.cpp
index 50ea903b48..62f224daa4 100644
--- a/modules/demux/adaptive/playlist/SegmentBase.cpp
+++ b/modules/demux/adaptive/playlist/SegmentBase.cpp
@@ -30,9 +30,7 @@
 using namespace adaptive::playlist;
 
 SegmentBase::SegmentBase(ICanonicalUrl *parent) :
- Segment(parent),
- Initializable(),
- Indexable()
+ Segment(parent)
 {
 }
 SegmentBase::~SegmentBase   ()
diff --git a/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp 
b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
index 74b9124a4b..bd826f0dfe 100644
--- a/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
@@ -31,7 +31,7 @@
 using namespace adaptive::playlist;
 
 SegmentInfoCommon::SegmentInfoCommon( ICanonicalUrl *parent ) :
-ICanonicalUrl( parent ), Initializable(), Indexable(),
+ICanonicalUrl( parent ),
 startIndex( 0 )
 {
 duration.Set(0);

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

[vlc-commits] mkv: Remove trailing whitespaces

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:06:31 2017 +0200| [af851dd9c45609829cc0d9dc6266e67b747489fc] | committer: 
Hugo Beauzée-Luyssen

mkv: Remove trailing whitespaces

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

 modules/demux/mkv/matroska_segment_seeker.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.hpp 
b/modules/demux/mkv/matroska_segment_seeker.hpp
index 1317514a8f..2b7abe7997 100644
--- a/modules/demux/mkv/matroska_segment_seeker.hpp
+++ b/modules/demux/mkv/matroska_segment_seeker.hpp
@@ -49,7 +49,7 @@ class SegmentSeeker
 
 bool operator<( Range const& rhs ) const
 {
-return start < rhs.start;
+return start < rhs.start;
 }
 };
 

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

[vlc-commits] satip: There is already an access_sys_t typedef

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:31:35 2017 +0200| [067c25378f37dd5e3ab6cfc4b41b121518038f58] | committer: 
Hugo Beauzée-Luyssen

satip: There is already an access_sys_t typedef

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

 modules/access/satip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/satip.c b/modules/access/satip.c
index b6e1695efc..f012e4b729 100644
--- a/modules/access/satip.c
+++ b/modules/access/satip.c
@@ -92,7 +92,7 @@ enum rtsp_result {
 };
 
 #define UDP_ADDRESS_LEN 16
-typedef struct access_sys_t {
+struct access_sys_t {
 char *content_base;
 char *control;
 char session_id[64];
@@ -115,7 +115,7 @@ typedef struct access_sys_t {
 uint16_t last_seq_nr;
 
 bool woken;
-} access_sys_t;
+};
 
 static void parse_session(char *request_line, char *session, unsigned max, int 
*timeout) {
 char *state;

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

[vlc-commits] libvlc: Remove trailing whitespaces

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
15:57:09 2017 +0200| [9d12a118a7e713f132b30f3ef6ed5f2f36166386] | committer: 
Hugo Beauzée-Luyssen

libvlc: Remove trailing whitespaces

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

 include/vlc/libvlc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 6b24678103..b12d900469 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -542,7 +542,7 @@ libvlc_module_description_t *libvlc_audio_filter_list_get( 
libvlc_instance_t *p_
 LIBVLC_API
 libvlc_module_description_t *libvlc_video_filter_list_get( libvlc_instance_t 
*p_instance );
 
-/** @} */
+/** @} */
 
 /** \defgroup libvlc_clock LibVLC time
  * These functions provide access to the LibVLC time/clock.
@@ -571,7 +571,7 @@ static inline int64_t libvlc_delay(int64_t pts)
 return pts - libvlc_clock();
 }
 
-/** @} */
+/** @} */
 
 # ifdef __cplusplus
 }

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

[vlc-commits] mkv: Don't use qualified name lookup on unscoped enum type

2017-10-12 Thread Hugo Beauzée-Luyssen

vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Oct 12 
16:08:56 2017 +0200| [e06135858d794dc77cbd31551f3ae08345f59fba] | committer: 
Hugo Beauzée-Luyssen

mkv: Don't use qualified name lookup on unscoped enum type

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

 modules/demux/mkv/matroska_segment_seeker.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.hpp 
b/modules/demux/mkv/matroska_segment_seeker.hpp
index 2b7abe7997..e2e1579354 100644
--- a/modules/demux/mkv/matroska_segment_seeker.hpp
+++ b/modules/demux/mkv/matroska_segment_seeker.hpp
@@ -61,7 +61,7 @@ class SegmentSeeker
 DISABLED = -1,
 };
 
-Seekpoint( fptr_t fpos, mtime_t pts, TrustLevel trust_level = 
TrustLevel::TRUSTED )
+Seekpoint( fptr_t fpos, mtime_t pts, TrustLevel trust_level = 
TRUSTED )
 : fpos( fpos ), pts( pts ), trust_level( trust_level )
 { }
 

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

[vlc-commits] variables: var_InheritBool: return false if a variable doesn't exist

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 13:24:44 
2017 +0200| [1532b7f5796e69ffbc3c118f60237329caf9f04e] | committer: Thomas 
Guillem

variables: var_InheritBool: return false if a variable doesn't exist

config_GetInt() returns -1 if the variable doesn't exist.

As var_GetBool() returns false if the variable doesn't exist, it's safe to
assume that var_InheritBool() should do the same.

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

 src/misc/variables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc/variables.c b/src/misc/variables.c
index 87a9c27478..810c8ffc81 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1194,7 +1194,7 @@ int var_Inherit( vlc_object_t *p_this, const char 
*psz_name, int i_type,
 p_val->i_int = config_GetInt( p_this, psz_name );
 break;
 case VLC_VAR_BOOL:
-p_val->b_bool = config_GetInt( p_this, psz_name );
+p_val->b_bool = config_GetInt( p_this, psz_name ) > 0;
 break;
 default:
 vlc_assert_unreachable();

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

[vlc-commits] skins2: return in case of error

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 13:27:27 
2017 +0200| [8b65fa1cc864862e5a8b10ca3db53a38ba2c9a71] | committer: Thomas 
Guillem

skins2: return in case of error

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

 modules/gui/skins2/src/theme_loader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gui/skins2/src/theme_loader.cpp 
b/modules/gui/skins2/src/theme_loader.cpp
index ee69776ac9..d18a6ca1a6 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -244,6 +244,7 @@ bool ThemeLoader::unarchive( const std::string& fileName, 
const std::string &tem
 if( !child_stream )
 {
 msg_Err( getIntf(), "unable to open %s for reading", 
child->psz_name );
+return false;
 }
 
 auto out_path = tempPath + "/" + child->psz_name;

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

[vlc-commits] libvlc: add "extractor-flatten" option

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 13:26:45 
2017 +0200| [780bf2cf517f493b9ad20ff9da156ab7ca9b0f89] | committer: Thomas 
Guillem

libvlc: add "extractor-flatten" option

Used to force extractors to flatten their file listing (done automatically by
vlc_readdir_helper helper).

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

 include/vlc_input_item.h |  1 +
 src/input/item.c | 20 +++-
 src/libvlc-module.c  |  7 +++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index d0f9587b7a..f64cfc9b80 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -425,6 +425,7 @@ struct vlc_readdir_helper
 size_t i_dirs;
 int i_sub_autodetect_fuzzy;
 bool b_show_hiddenfiles;
+bool b_flatten;
 char *psz_ignored_exts;
 };
 
diff --git a/src/input/item.c b/src/input/item.c
index 99cf6a2066..0327e21f03 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1686,6 +1686,7 @@ void vlc_readdir_helper_init(struct vlc_readdir_helper 
*p_rdh,
 bool b_autodetect = var_InheritBool(p_obj, "sub-autodetect-file");
 p_rdh->i_sub_autodetect_fuzzy = !b_autodetect ? 0 :
 var_InheritInteger(p_obj, "sub-autodetect-fuzzy");
+p_rdh->b_flatten = var_InheritBool(p_obj, "extractor-flatten");
 TAB_INIT(p_rdh->i_slaves, p_rdh->pp_slaves);
 TAB_INIT(p_rdh->i_dirs, p_rdh->pp_dirs);
 
@@ -1728,13 +1729,22 @@ int vlc_readdir_helper_additem(struct 
vlc_readdir_helper *p_rdh,
 struct rdh_slave *p_rdh_slave = NULL;
 assert(psz_flatpath || psz_filename);
 
-if (psz_filename == NULL)
+if (!p_rdh->b_flatten)
 {
-psz_filename = strrchr(psz_flatpath, '/');
-if (psz_filename != NULL)
-++psz_filename;
-else
+if (psz_filename == NULL)
+{
+psz_filename = strrchr(psz_flatpath, '/');
+if (psz_filename != NULL)
+++psz_filename;
+else
+psz_filename = psz_flatpath;
+}
+}
+else
+{
+if (psz_filename == NULL)
 psz_filename = psz_flatpath;
+psz_flatpath = NULL;
 }
 
 if (p_rdh->i_sub_autodetect_fuzzy != 0
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 6fe8e92ff6..7e1d90be15 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1138,6 +1138,11 @@ static const char *const psz_recursive_list_text[] = {
 #define SHOW_HIDDENFILES_LONGTEXT N_( \
 "Ignore files starting with '.'" )
 
+#define EXTRACTOR_FLATTEN_TEXT N_( \
+"Flatten files listed by extractors (archive)")
+#define EXTRACTOR_FLATTEN_LONGTEXT N_( \
+"The default behavior is to create one item per directory.")
+
 #define SD_TEXT N_( "Services discovery modules")
 #define SD_LONGTEXT N_( \
  "Specifies the services discovery modules to preload, separated by " \
@@ -2099,6 +2104,8 @@ vlc_module_begin ()
 IGNORE_TEXT, IGNORE_LONGTEXT, false )
 add_bool( "show-hiddenfiles", false,
   SHOW_HIDDENFILES_TEXT, SHOW_HIDDENFILES_LONGTEXT, false )
+add_bool( "extractor-flatten", false,
+  EXTRACTOR_FLATTEN_TEXT, EXTRACTOR_FLATTEN_LONGTEXT, true );
 
 set_subcategory( SUBCAT_PLAYLIST_SD )
 add_string( "services-discovery", "", SD_TEXT, SD_LONGTEXT, true )

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

[vlc-commits] input: readdir_helper: don't apply options on the current object

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 10:41:44 
2017 +0200| [6c87f601071d8ca1e9a321fd0a13824359e990a4] | committer: Thomas 
Guillem

input: readdir_helper: don't apply options on the current object

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

 src/input/item.c | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/input/item.c b/src/input/item.c
index 187f633e3c..99cf6a2066 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1670,8 +1670,15 @@ void vlc_readdir_helper_init(struct vlc_readdir_helper 
*p_rdh,
  vlc_object_t *p_obj, input_item_node_t *p_node)
 {
 /* Read options from the parent item. This allows vlc_stream_ReadDir()
- * users to specify options whitout touching any vlc_object_t. */
-input_item_ApplyOptions(p_obj, p_node->p_item);
+ * users to specify options whitout touhing any vlc_object_t. Apply options
+ * on a temporary object in order to not apply options (that can be
+ * insecure) to the current object. */
+vlc_object_t *p_var_obj = vlc_object_create(p_obj, sizeof(vlc_object_t));
+if (p_var_obj != NULL)
+{
+input_item_ApplyOptions(p_var_obj, p_node->p_item);
+p_obj = p_var_obj;
+}
 
 p_rdh->p_node = p_node;
 p_rdh->b_show_hiddenfiles = var_InheritBool(p_obj, "show-hiddenfiles");
@@ -1681,6 +1688,9 @@ void vlc_readdir_helper_init(struct vlc_readdir_helper 
*p_rdh,
 var_InheritInteger(p_obj, "sub-autodetect-fuzzy");
 TAB_INIT(p_rdh->i_slaves, p_rdh->pp_slaves);
 TAB_INIT(p_rdh->i_dirs, p_rdh->pp_dirs);
+
+if (p_var_obj != NULL)
+vlc_object_release(p_var_obj);
 }
 
 void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool 
b_success)

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

[vlc-commits] skins2: fix unarchive

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 13:28:31 
2017 +0200| [8e453e61d60ef990beb32f77f7f8d21b7afd19b3] | committer: Thomas 
Guillem

skins2: fix unarchive

Tell the stream extractor to read all files and flatten the result.

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

 modules/gui/skins2/src/theme_loader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/skins2/src/theme_loader.cpp 
b/modules/gui/skins2/src/theme_loader.cpp
index d18a6ca1a6..d018b4e92e 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -229,6 +229,8 @@ bool ThemeLoader::unarchive( const std::string& fileName, 
const std::string &tem
 if( !item || !node )
 return false;
 
+input_item_AddOption( item.get(), "ignore-filetypes=\"\"", 
VLC_INPUT_OPTION_TRUSTED );
+input_item_AddOption( item.get(), "extractor-flatten", 
VLC_INPUT_OPTION_TRUSTED );
 node->p_item = item.release();
 
 if( vlc_stream_ReadDir( input.get(), node.get() ) )

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

[vlc-commits] videotoolbox: abort if no vout handle CVPX chroma

2017-10-12 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Thu Oct 12 10:42:44 
2017 +0200| [0b91e9951dfab80c24a0a74ce846fcda14a74d95] | committer: Thomas 
Guillem

videotoolbox: abort if no vout handle CVPX chroma

Fixes #18537

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

 modules/codec/videotoolbox.m | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 800a36e328..f460f56133 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -1609,7 +1609,12 @@ static int UpdateVideoFormat(decoder_t *p_dec, 
CVPixelBufferRef imageBuffer)
 p_dec->p_sys->vtsession_status = VTSESSION_STATUS_ABORT;
 return -1;
 }
-return decoder_UpdateVideoFormat(p_dec);
+if (decoder_UpdateVideoFormat(p_dec) != 0)
+{
+p_dec->p_sys->vtsession_status = VTSESSION_STATUS_ABORT;
+return -1;
+}
+return 0;
 }
 
 static void DecoderCallback(void *decompressionOutputRefCon,

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

[vlc-commits] demux: adaptive: fix inverted logic

2017-10-12 Thread Zhao Zhili

vlc | branch: master | Zhao Zhili  | Thu Oct 12 
11:50:05 2017 +0800| [f9a64520582ac36bc7bf32d2c5b38a20af0aed6d] | committer: 
Francois Cartegnie

demux: adaptive: fix inverted logic

Signed-off-by: Francois Cartegnie 

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

 modules/demux/adaptive/http/HTTPConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp 
b/modules/demux/adaptive/http/HTTPConnection.cpp
index 21cf1dc97d..5934fb7270 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -239,7 +239,7 @@ int HTTPConnection::parseReply()
 for( ;; )
 {
 std::string l = readLine();
-if(!l.empty() && l.compare("\r\n"))
+if(l.empty() || l.compare("\r\n") == 0)
 break;
 lines.append(l);
 

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

40 matches

Mail list logo