[vlc-commits] ty: remove no-op cast

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:52:53 2018 +0200| [f81b0b20ab981e1821ad98a15af30b2cfe66a677] | committer: 
Rémi Denis-Courmont

ty: remove no-op cast

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

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

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index 6498c4e967..d985c359cc 100644
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -513,7 +513,7 @@ static int Control(demux_t *p_demux, int i_query, va_list 
args)
 
 case DEMUX_SET_POSITION:
 /* arg is 0.0 - 1.0 percent of overall file position */
-f = (double) va_arg( args, double );
+f = va_arg( args, double );
 /* msg_Dbg(p_demux, "Control - set position to %2.3f", f); */
 if ((i64 = p_sys->i_stream_size) > 0)
 return ty_stream_seek_pct(p_demux, f);

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

[vlc-commits] mmstu: remove no-op cast

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:52:53 2018 +0200| [0bbab474a1d31f3c1af723b8d3d5cb8e499c4333] | committer: 
Rémi Denis-Courmont

mmstu: remove no-op cast

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

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

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 37e3a60926..4cc20c65a6 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -257,7 +257,7 @@ static int Control( stream_t *p_access, int i_query, 
va_list args )
 
 case STREAM_GET_PRIVATE_ID_STATE:
 i_int = va_arg( args, int );
-pb_bool = (bool *)va_arg( args, bool * );
+pb_bool = va_arg( args, bool * );
 
 if( i_int < 0 || i_int > 127 )
 return VLC_EGENERIC;

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

[vlc-commits] playlist: remove no-op cast

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:52:53 2018 +0200| [f5245525e96bae7f7cec191329bd023db2931154] | committer: 
Rémi Denis-Courmont

playlist: remove no-op cast

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

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

diff --git a/src/playlist_legacy/control.c b/src/playlist_legacy/control.c
index efef3bf7ef..b35f46f283 100644
--- a/src/playlist_legacy/control.c
+++ b/src/playlist_legacy/control.c
@@ -118,7 +118,7 @@ static void playlist_vaControl( playlist_t *p_playlist, int 
i_query,
 case PLAYLIST_SKIP:
 pl_priv(p_playlist)->request.p_node = get_current_status_node( 
p_playlist );
 pl_priv(p_playlist)->request.p_item = get_current_status_item( 
p_playlist );
-pl_priv(p_playlist)->request.i_skip = (int) va_arg( args, int );
+pl_priv(p_playlist)->request.i_skip = va_arg( args, int );
 pl_priv(p_playlist)->request.b_request = true;
 break;
 

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

[vlc-commits] input: remove no-op casts

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:52:53 2018 +0200| [07c1cc6c893d06d5e28ee60b6d87f5d552f27f30] | committer: 
Rémi Denis-Courmont

input: remove no-op casts

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

 src/input/control.c  |  2 +-
 src/input/demux.c|  4 +--
 src/input/es_out_timeshift.c | 60 ++--
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/input/control.c b/src/input/control.c
index dc7b7c6c15..3c8afc1dad 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -229,7 +229,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, 
va_list args )
 
 case INPUT_ADD_SLAVE:
 {
-enum slave_type type =  (enum slave_type) va_arg( args, enum 
slave_type );
+enum slave_type type =  va_arg( args, enum slave_type );
 psz = va_arg( args, char * );
 b_bool = va_arg( args, int );
 bool b_notify = va_arg( args, int );
diff --git a/src/input/demux.c b/src/input/demux.c
index 31be72cbb2..370a65082e 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -326,7 +326,7 @@ int demux_vaControlHelper( stream_t *s,
 return VLC_EGENERIC;
 
 case DEMUX_GET_POSITION:
-pf = (double*)va_arg( args, double * );
+pf = va_arg( args, double * );
 if( i_start < i_end )
 {
 *pf = (double)( i_tell - i_start ) /
@@ -337,7 +337,7 @@ int demux_vaControlHelper( stream_t *s,
 
 
 case DEMUX_SET_POSITION:
-f = (double)va_arg( args, double );
+f = va_arg( args, double );
 if( i_start < i_end && f >= 0.0 && f <= 1.0 )
 {
 int64_t i_block = (f * ( i_end - i_start )) / i_align;
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 7237ca8799..624e8b35ba 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -643,8 +643,8 @@ static int ControlLocked( es_out_t *p_out, int i_query, 
va_list args )
 /* Special control when delayed */
 case ES_OUT_GET_ES_STATE:
 {
-es_out_id_t *p_es = (es_out_id_t*)va_arg( args, es_out_id_t * );
-bool *pb_enabled = (bool*)va_arg( args, bool* );
+es_out_id_t *p_es = va_arg( args, es_out_id_t * );
+bool *pb_enabled = va_arg( args, bool* );
 
 if( p_sys->b_delayed )
 {
@@ -678,7 +678,7 @@ static int ControlLocked( es_out_t *p_out, int i_query, 
va_list args )
 }
 case ES_OUT_SPU_SET_HIGHLIGHT:
 {
-es_out_id_t *p_es = (es_out_id_t*)va_arg( args, es_out_id_t * );
+es_out_id_t *p_es = va_arg( args, es_out_id_t * );
 const vlc_spu_highlight_t *p_hl = va_arg( args, const 
vlc_spu_highlight_t * );
 return es_out_Control( p_sys->p_out, ES_OUT_SPU_SET_HIGHLIGHT,
p_es->p_es, p_hl );
@@ -686,31 +686,31 @@ static int ControlLocked( es_out_t *p_out, int i_query, 
va_list args )
 /* Special internal input control */
 case ES_OUT_GET_EMPTY:
 {
-bool *pb_empty = (bool*)va_arg( args, bool* );
+bool *pb_empty = va_arg( args, bool* );
 return ControlLockedGetEmpty( p_out, pb_empty );
 }
 case ES_OUT_GET_WAKE_UP: /* TODO ? */
 {
-vlc_tick_t *pi_wakeup = (vlc_tick_t*)va_arg( args, vlc_tick_t* );
+vlc_tick_t *pi_wakeup = va_arg( args, vlc_tick_t* );
 return ControlLockedGetWakeup( p_out, pi_wakeup );
 }
 case ES_OUT_GET_BUFFERING:
 {
-bool *pb_buffering = (bool *)va_arg( args, bool* );
+bool *pb_buffering = va_arg( args, bool* );
 return ControlLockedGetBuffering( p_out, pb_buffering );
 }
 case ES_OUT_SET_PAUSE_STATE:
 {
 const bool b_source_paused = (bool)va_arg( args, int );
 const bool b_paused = (bool)va_arg( args, int );
-const vlc_tick_t i_date = (vlc_tick_t) va_arg( args, vlc_tick_t );
+const vlc_tick_t i_date = va_arg( args, vlc_tick_t );
 
 return ControlLockedSetPauseState( p_out, b_source_paused, b_paused, 
i_date );
 }
 case ES_OUT_SET_RATE:
 {
-const int i_src_rate = (int)va_arg( args, int );
-const int i_rate = (int)va_arg( args, int );
+const int i_src_rate = va_arg( args, int );
+const int i_rate = va_arg( args, int );
 
 return ControlLockedSetRate( p_out, i_src_rate, i_rate );
 }
@@ -1395,21 +1395,21 @@ static int CmdInitControl( ts_cmd_t *p_cmd, int 
i_query, va_list args, bool b_co
 case ES_OUT_SET_MODE:/* arg1= int*/
 case ES_OUT_SET_GROUP:   /* arg1= int*/
 case ES_OUT_DEL_GROUP:   /* arg1=int i_group */
-p_cmd->u.control.u.i_int = (int)va_arg( args, int );
+p_cmd->u.control.u.i_int = va_arg( args, int );
 break;
 
 case

[vlc-commits] lua: remove no-op casts

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:52:39 2018 +0200| [9314dc4913e6563c2bbb6fcab01761f6320c87e6] | committer: 
Rémi Denis-Courmont

lua: remove no-op casts

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

 modules/lua/extension.c | 43 ---
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index f0b3f3eae1..cdf30cd17f 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -517,54 +517,53 @@ static int Control( extensions_manager_t *p_mgr, int 
i_control, va_list args )
 switch( i_control )
 {
 case EXTENSION_ACTIVATE:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 return Activate( p_mgr, p_ext );
 
 case EXTENSION_DEACTIVATE:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 return Deactivate( p_mgr, p_ext );
 
 case EXTENSION_IS_ACTIVATED:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
-pb = ( bool* ) va_arg( args, bool* );
+p_ext = va_arg( args, extension_t* );
+pb = va_arg( args, bool* );
 vlc_mutex_lock( _ext->p_sys->command_lock );
 *pb = p_ext->p_sys->b_activated;
 vlc_mutex_unlock( _ext->p_sys->command_lock );
 break;
 
 case EXTENSION_HAS_MENU:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
-pb = ( bool* ) va_arg( args, bool* );
+p_ext = va_arg( args, extension_t* );
+pb = va_arg( args, bool* );
 *pb = ( p_ext->p_sys->i_capabilities & EXT_HAS_MENU ) ? 1 : 0;
 break;
 
 case EXTENSION_GET_MENU:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
-pppsz = ( char*** ) va_arg( args, char*** );
-ppus = ( uint16_t** ) va_arg( args, uint16_t** );
+p_ext = va_arg( args, extension_t* );
+pppsz = va_arg( args, char*** );
+ppus = va_arg( args, uint16_t** );
 if( p_ext == NULL )
 return VLC_EGENERIC;
 return GetMenuEntries( p_mgr, p_ext, pppsz, ppus );
 
 case EXTENSION_TRIGGER_ONLY:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
-pb = ( bool* ) va_arg( args, bool* );
+p_ext = va_arg( args, extension_t* );
+pb = va_arg( args, bool* );
 *pb = ( p_ext->p_sys->i_capabilities & EXT_TRIGGER_ONLY ) ? 1 : 0;
 break;
 
 case EXTENSION_TRIGGER:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 return TriggerExtension( p_mgr, p_ext );
 
 case EXTENSION_TRIGGER_MENU:
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
-// GCC: 'uint16_t' is promoted to 'int' when passed through '...'
-i = ( int ) va_arg( args, int );
+p_ext = va_arg( args, extension_t* );
+i = va_arg( args, int );
 return TriggerMenu( p_ext, i );
 
 case EXTENSION_SET_INPUT:
 {
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 input_thread_t *p_input = va_arg( args, struct input_thread_t * );
 
 if( p_ext == NULL )
@@ -623,10 +622,9 @@ static int Control( extensions_manager_t *p_mgr, int 
i_control, va_list args )
 }
 case EXTENSION_PLAYING_CHANGED:
 {
-extension_t *p_ext;
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 assert( p_ext->psz_name != NULL );
-i = ( int ) va_arg( args, int );
+i = va_arg( args, int );
 if( p_ext->p_sys->i_capabilities & EXT_PLAYING_LISTENER )
 {
 PushCommand( p_ext, CMD_PLAYING_CHANGED, i );
@@ -635,8 +633,7 @@ static int Control( extensions_manager_t *p_mgr, int 
i_control, va_list args )
 }
 case EXTENSION_META_CHANGED:
 {
-extension_t *p_ext;
-p_ext = ( extension_t* ) va_arg( args, extension_t* );
+p_ext = va_arg( args, extension_t* );
 PushCommand( p_ext, CMD_UPDATE_META );
 break;
 }
@@ -945,11 +942,11 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, 
extension_t *p_ext,
 {
 if( type == LUA_NUM )
 {
-lua_pushnumber( L , ( int ) va_arg( args, int ) );
+lua_pushnumber( L , va_arg( args, int ) );
 }
 else if( type == LUA_TEXT )
 {
-lua_pushstring( L , ( char * ) va_arg( args, char* ) );
+

[vlc-commits] vlmshell: missing cast

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:41:17 2018 +0200| [93386cc6e79c862345541bc47e435c60f70a2bcf] | committer: 
Rémi Denis-Courmont

vlmshell: missing cast

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

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

diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 828b81bfe8..b536df1fc9 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -405,7 +405,7 @@ static int ExecuteControl( vlm_t *p_vlm, const char 
*psz_name, const int i_arg,
 }
 
 if( p_media->cfg.b_vod )
-i_result = vlm_ControlInternal( p_vlm, 
VLM_START_MEDIA_VOD_INSTANCE, p_media->cfg.id, psz_instance, i_input_index, 
NULL );// we should get here now
+i_result = vlm_ControlInternal( p_vlm, 
VLM_START_MEDIA_VOD_INSTANCE, p_media->cfg.id, psz_instance, i_input_index, 
(const char *)NULL );// we should get here now
 else
 i_result = vlm_ControlInternal( p_vlm, 
VLM_START_MEDIA_BROADCAST_INSTANCE, p_media->cfg.id, psz_instance, 
i_input_index );
 }

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

[vlc-commits] macosx: fix execl() calls

2018-12-03 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Mon Dec  3 
19:35:35 2018 +0200| [2219c816d5ff29c00560e616d78068305f11892d] | committer: 
Rémi Denis-Courmont

macosx: fix execl() calls

The guarding nul pointer must be char *.
NULL is either void * or an integer depending on the toolchain...

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

 modules/gui/macosx/VLCMain+OldPrefs.m | 2 +-
 modules/gui/macosx/VLCSimplePrefsController.m | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCMain+OldPrefs.m 
b/modules/gui/macosx/VLCMain+OldPrefs.m
index 7e7e0312fb..2ddecd5bb6 100644
--- a/modules/gui/macosx/VLCMain+OldPrefs.m
+++ b/modules/gui/macosx/VLCMain+OldPrefs.m
@@ -142,7 +142,7 @@ static const int kCurrentPreferencesVersion = 4;
 if (fork() != 0) {
 exit(0);
 }
-execl(path, path, NULL);
+execl(path, path, (char *)NULL);
 }
 
 @end
diff --git a/modules/gui/macosx/VLCSimplePrefsController.m 
b/modules/gui/macosx/VLCSimplePrefsController.m
index 23e273bdaa..f4cdce7bbd 100644
--- a/modules/gui/macosx/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/VLCSimplePrefsController.m
@@ -836,7 +836,7 @@ static inline const char * __config_GetLabel(vlc_object_t 
*p_this, const char *p
 exit(0);
 return;
 }
-execl(path, path, NULL);
+execl(path, path, (char *)NULL);
 }
 }];
 }

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

[vlc-commits] direct3d11: do an extra copy when using AMD RX Vega 56/64 chips

2018-12-03 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Thu Nov 29 
12:29:07 2018 +0100| [476079cf6f34d00ba5403730dcebdf1766dee8b0] | committer: 
Steve Lhomme

direct3d11: do an extra copy when using AMD RX Vega 56/64 chips

They display garbage otherwise

(cherry picked from commit 1882a005d9607bea702a2b4ea8b95c8f467f855a)

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

 modules/video_output/win32/direct3d11.c | 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 32d06caa00..2bd2523897 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1481,6 +1481,29 @@ static bool CanUseTextureArray(vout_display_t *vd)
 #endif
 }
 
+static bool BogusZeroCopy(vout_display_t *vd)
+{
+IDXGIAdapter *p_adapter = D3D11DeviceAdapter(vd->sys->d3d_dev.d3ddevice);
+if (!p_adapter)
+return false;
+
+DXGI_ADAPTER_DESC adapterDesc;
+if (FAILED(IDXGIAdapter_GetDesc(p_adapter, )))
+return false;
+IDXGIAdapter_Release(p_adapter);
+
+if (adapterDesc.VendorId != GPU_MANUFACTURER_AMD)
+return false;
+
+switch (adapterDesc.DeviceId)
+{
+case 0x687F: // RX Vega 56/64
+return true;
+default:
+return false;
+}
+}
+
 /* TODO : handle errors better
TODO : seperate out into smaller functions like createshaders */
 static int Direct3D11CreateFormatResources(vout_display_t *vd, const 
video_format_t *fmt)
@@ -1488,7 +1511,8 @@ static int Direct3D11CreateFormatResources(vout_display_t 
*vd, const video_forma
 vout_display_sys_t *sys = vd->sys;
 HRESULT hr;
 
-sys->legacy_shader = sys->d3d_dev.feature_level < D3D_FEATURE_LEVEL_10_0 
|| !CanUseTextureArray(vd);
+sys->legacy_shader = sys->d3d_dev.feature_level < D3D_FEATURE_LEVEL_10_0 
|| !CanUseTextureArray(vd) ||
+BogusZeroCopy(vd);
 
 hr = D3D11_CompilePixelShader(vd, >hd3d, sys->legacy_shader, 
>d3d_dev,
   sys->picQuad.formatInfo, >display, 
fmt->transfer, fmt->primaries,

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

[vlc-commits] direct3d11: disable zero-copy for RX Vega 8/11 too

2018-12-03 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Dec  3 
10:33:54 2018 +0100| [9982a175938e73f8b9af9d473bb508427d195d1f] | committer: 
Steve Lhomme

direct3d11: disable zero-copy for RX Vega 8/11 too

https://forum.videolan.org/viewtopic.php?f=14=147078=483016
(cherry picked from commit 886d23692ae9cd9a48c237f0a3d9c1416949d7ae)

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 79114b708e..91252a5ec8 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1499,6 +1499,7 @@ static bool BogusZeroCopy(vout_display_t *vd)
 {
 case 0x687F: // RX Vega 56/64
 case 0x6863: // RX Vega Frontier Edition
+case 0x15DD: // RX Vega 8/11 (Ryzen iGPU)
 return true;
 default:
 return false;

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

[vlc-commits] update NEWS with RX Vega fixes

2018-12-03 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Dec  3 
17:53:19 2018 +0100| [2a326d9b35ca49afce30de0ad4ca24773271dfa5] | committer: 
Steve Lhomme

update NEWS with RX Vega fixes

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

 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index fc3391202d..4f41d8090d 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Video Output:
  * fix Direct3D11 tone-mapping when HDR is displayed on an SDR screen
  * More accurate colors for SD sources in Direct3D11
  * Disable hardware decoding on some old Intel GPUs
+ * Fix zero-copy GPU acceleration on AMD RX Vega
 
 Changes between 3.0.3 and 3.0.4:
 

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

[vlc-commits] direct3d11: disable zero-copy for RX Vega Frontier Edition too

2018-12-03 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Fri Nov 30 
17:12:24 2018 +0100| [613ee774aa46dd6c379b470c67e447ed48662c9b] | committer: 
Steve Lhomme

direct3d11: disable zero-copy for RX Vega Frontier Edition too

See #21215

(cherry picked from commit a7eed838d4ab1876bed6c7461199ff8d85ef648f)

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 2bd2523897..79114b708e 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1498,6 +1498,7 @@ static bool BogusZeroCopy(vout_display_t *vd)
 switch (adapterDesc.DeviceId)
 {
 case 0x687F: // RX Vega 56/64
+case 0x6863: // RX Vega Frontier Edition
 return true;
 default:
 return false;

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

[vlc-commits] direct3d11: the RX Vega zero copy issue is fixed in drivers 24.20.14011.xxx

2018-12-03 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Dec  3 
17:45:14 2018 +0100| [f18118a18479d63e9c689405f095e3a6adf144cd] | committer: 
Steve Lhomme

direct3d11: the RX Vega zero copy issue is fixed in drivers 24.20.14011.xxx

(cherry picked from commit 4791208a7461e21f274571ff18bd7bcee093bd57)

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

 modules/video_output/win32/direct3d11.c | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 91252a5ec8..36bc09892c 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1500,7 +1500,15 @@ static bool BogusZeroCopy(vout_display_t *vd)
 case 0x687F: // RX Vega 56/64
 case 0x6863: // RX Vega Frontier Edition
 case 0x15DD: // RX Vega 8/11 (Ryzen iGPU)
-return true;
+{
+struct wddm_version WDDM = {
+.wddm = 0,
+.d3d_features = 0,
+.revision = 14011,
+.build= 0,
+};
+return D3D11CheckDriverVersion(>sys->d3d_dev, 
GPU_MANUFACTURER_AMD, ) != VLC_SUCCESS;
+}
 default:
 return false;
 }

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

[vlc-commits] direct3d11: the RX Vega zero copy issue is fixed in drivers 24.20.14011.xxx

2018-12-03 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Mon Dec  3 17:45:14 
2018 +0100| [4791208a7461e21f274571ff18bd7bcee093bd57] | committer: Steve Lhomme

direct3d11: the RX Vega zero copy issue is fixed in drivers 24.20.14011.xxx

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

 modules/video_output/win32/direct3d11.c | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 4474c46491..e70180e54b 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1465,7 +1465,15 @@ static bool BogusZeroCopy(vout_display_t *vd)
 case 0x687F: // RX Vega 56/64
 case 0x6863: // RX Vega Frontier Edition
 case 0x15DD: // RX Vega 8/11 (Ryzen iGPU)
-return true;
+{
+struct wddm_version WDDM = {
+.wddm = 0,
+.d3d_features = 0,
+.revision = 14011,
+.build= 0,
+};
+return D3D11CheckDriverVersion(>sys->d3d_dev, 
GPU_MANUFACTURER_AMD, ) != VLC_SUCCESS;
+}
 default:
 return false;
 }

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

[vlc-commits] direct3d11: disable zero-copy for RX Vega 8/11 too

2018-12-03 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Mon Dec  3 10:33:54 
2018 +0100| [886d23692ae9cd9a48c237f0a3d9c1416949d7ae] | committer: Steve Lhomme

direct3d11: disable zero-copy for RX Vega 8/11 too

https://forum.videolan.org/viewtopic.php?f=14=147078=483016

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

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

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 1f72a69822..4474c46491 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1464,6 +1464,7 @@ static bool BogusZeroCopy(vout_display_t *vd)
 {
 case 0x687F: // RX Vega 56/64
 case 0x6863: // RX Vega Frontier Edition
+case 0x15DD: // RX Vega 8/11 (Ryzen iGPU)
 return true;
 default:
 return false;

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

[vlc-commits] contrib: shout: Don't force -lwsock32

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Mon Dec 
 3 15:06:16 2018 +0100| [395447ed19f4e7f342d3dd06761e8e1384f3665c] | committer: 
Hugo Beauzée-Luyssen

contrib: shout: Don't force -lwsock32

(cherry picked from commit 2e5a1e8b46f59b90e5b14da24f47103cca165e76)
Signed-off-by: Hugo Beauzée-Luyssen 

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

 contrib/src/shout/no-force-libwsock.patch | 11 +++
 contrib/src/shout/rules.mak   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/shout/no-force-libwsock.patch 
b/contrib/src/shout/no-force-libwsock.patch
new file mode 100644
index 00..4c619acbd8
--- /dev/null
+++ b/contrib/src/shout/no-force-libwsock.patch
@@ -0,0 +1,11 @@
+--- libshout/m4/xiph_net.m4.old2018-12-03 14:41:36.427782211 +0100
 libshout/m4/xiph_net.m42018-12-03 14:41:43.235782185 +0100
+@@ -7,7 +7,7 @@
+ AC_CHECK_HEADERS([sys/select.h sys/uio.h])
+ AC_CHECK_HEADER([winsock2.h],
+   [AC_DEFINE([HAVE_WINSOCK2_H], [1], [Define if you have winsock2.h on MINGW])
+-   LIBS="$LIBS -lwsock32"])
++   ])
+ 
+ # These tests are ordered based on solaris 8 tests
+ AC_SEARCH_LIBS([sethostent], [nsl],
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 07f577dce1..e48b0b37c1 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -24,6 +24,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/no-examples.patch
+   $(APPLY) $(SRC)/shout/no-force-libwsock.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)

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

[vlc-commits] contrib: libdsm depends on pthreads

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Mon Dec 
 3 14:19:54 2018 +0100| [84acd56da0f748c28be54ab78e3545897e6a040e] | committer: 
Hugo Beauzée-Luyssen

contrib: libdsm depends on pthreads

(cherry picked from commit 03ad554ba54c4f8c006c786f3547a0b22ecaec80)
Signed-off-by: Hugo Beauzée-Luyssen 

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

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

diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index f5235be43f..1ea9b769b5 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -27,6 +27,9 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(MOVE)
 
 DEPS_libdsm = libtasn1 iconv
+ifdef HAVE_WIN32
+DEPS_libdsm += pthreads $(DEPS_pthreads)
+endif
 
 .libdsm: libdsm
$(RECONF)

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

[vlc-commits] contrib: libdsm: Don't use _pipe on winstore

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Mon Dec 
 3 14:19:40 2018 +0100| [d8ab4cbd7fc8b7ee8fba456aa71ffebf851f50e0] | committer: 
Hugo Beauzée-Luyssen

contrib: libdsm: Don't use _pipe on winstore

(cherry picked from commit 82faba6e5ecbd7d3159820ef4ab71dc8083ea8dc)
Signed-off-by: Hugo Beauzée-Luyssen 

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

 ...on-t-use-_pipe-when-building-for-winstore.patch | 37 ++
 contrib/src/libdsm/rules.mak   |  1 +
 2 files changed, 38 insertions(+)

diff --git 
a/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
 
b/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
new file mode 100644
index 00..6df9ce8a1b
--- /dev/null
+++ 
b/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
@@ -0,0 +1,37 @@
+From 45e48b777207853d7b125612b40b5d8fde101634 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= 
+Date: Mon, 3 Dec 2018 14:13:26 +0100
+Subject: [PATCH] compat: Don't use _pipe when building for winstore
+
+---
+ compat/compat.h | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/compat/compat.h b/compat/compat.h
+index 4eef355..b7f878c 100644
+--- a/compat/compat.h
 b/compat/compat.h
+@@ -66,13 +66,18 @@ char *strndup(const char *str, size_t n);
+ #endif
+ 
+ #if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
+-#include 
+-#define HAVE_PIPE
++# ifdef _WIN32
++#  include 
++# endif
++# if !defined(_WIN32) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++#  include 
++#  define HAVE_PIPE
+ static inline int pipe(int fds[2])
+ {
+ return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
+ }
+ #endif
++#endif
+ 
+ #ifndef _WIN32
+ #define closesocket(fd) close(fd)
+-- 
+2.19.2
+
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 79a235333f..f5235be43f 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -23,6 +23,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(APPLY) 
$(SRC)/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
$(APPLY) $(SRC)/libdsm/fix-pc-generation.patch
$(APPLY) $(SRC)/libdsm/fix-pipe-compat.patch
+   $(APPLY) 
$(SRC)/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
$(MOVE)
 
 DEPS_libdsm = libtasn1 iconv

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

[vlc-commits] contrib: shout: Don't force -lwsock32

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Mon Dec  3 
15:06:16 2018 +0100| [2e5a1e8b46f59b90e5b14da24f47103cca165e76] | committer: 
Hugo Beauzée-Luyssen

contrib: shout: Don't force -lwsock32

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

 contrib/src/shout/no-force-libwsock.patch | 11 +++
 contrib/src/shout/rules.mak   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/shout/no-force-libwsock.patch 
b/contrib/src/shout/no-force-libwsock.patch
new file mode 100644
index 00..4c619acbd8
--- /dev/null
+++ b/contrib/src/shout/no-force-libwsock.patch
@@ -0,0 +1,11 @@
+--- libshout/m4/xiph_net.m4.old2018-12-03 14:41:36.427782211 +0100
 libshout/m4/xiph_net.m42018-12-03 14:41:43.235782185 +0100
+@@ -7,7 +7,7 @@
+ AC_CHECK_HEADERS([sys/select.h sys/uio.h])
+ AC_CHECK_HEADER([winsock2.h],
+   [AC_DEFINE([HAVE_WINSOCK2_H], [1], [Define if you have winsock2.h on MINGW])
+-   LIBS="$LIBS -lwsock32"])
++   ])
+ 
+ # These tests are ordered based on solaris 8 tests
+ AC_SEARCH_LIBS([sethostent], [nsl],
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 417137bd6d..ea6d307d34 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -27,6 +27,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/shout-timeval.patch
$(APPLY) $(SRC)/shout/shout-win32-socklen.patch
$(APPLY) $(SRC)/shout/no-examples.patch
+   $(APPLY) $(SRC)/shout/no-force-libwsock.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)

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

[vlc-commits] test: thumbnail: Fix/clarify error messages

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Fri Nov 30 
13:20:30 2018 +0100| [35244a15dc59265ed42a0832060696b0c5066e28] | committer: 
Hugo Beauzée-Luyssen

test: thumbnail: Fix/clarify error messages

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

 test/src/input/thumbnail.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/src/input/thumbnail.c b/test/src/input/thumbnail.c
index 37a86f3b9b..b7dc26f978 100644
--- a/test/src/input/thumbnail.c
+++ b/test/src/input/thumbnail.c
@@ -74,7 +74,8 @@ static void thumbnailer_callback( void* data, picture_t* 
thumbnail )
 
 if ( thumbnail != NULL )
 {
-assert( test_params[p_ctx->test_idx].b_expected_success && "Unexpected 
failure" );
+assert( test_params[p_ctx->test_idx].b_expected_success &&
+"Expected failure but got a thumbnail" );
 assert( thumbnail->format.i_chroma == VLC_CODEC_ARGB );
 
 /* TODO: Enable this once the new clock is merged */
@@ -96,7 +97,8 @@ static void thumbnailer_callback( void* data, picture_t* 
thumbnail )
 #endif
 }
 else
-assert( !test_params[p_ctx->test_idx].b_expected_success && 
"Unexpected thumbnail" );
+assert( !test_params[p_ctx->test_idx].b_expected_success &&
+"Expected a thumbnail but got a failure" );
 
 p_ctx->b_done = true;
 vlc_cond_signal( _ctx->cond );

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

[vlc-commits] contrib: libdsm: Don't use _pipe on winstore

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Mon Dec  3 
14:19:40 2018 +0100| [82faba6e5ecbd7d3159820ef4ab71dc8083ea8dc] | committer: 
Hugo Beauzée-Luyssen

contrib: libdsm: Don't use _pipe on winstore

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

 ...on-t-use-_pipe-when-building-for-winstore.patch | 37 ++
 contrib/src/libdsm/rules.mak   |  1 +
 2 files changed, 38 insertions(+)

diff --git 
a/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
 
b/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
new file mode 100644
index 00..6df9ce8a1b
--- /dev/null
+++ 
b/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
@@ -0,0 +1,37 @@
+From 45e48b777207853d7b125612b40b5d8fde101634 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= 
+Date: Mon, 3 Dec 2018 14:13:26 +0100
+Subject: [PATCH] compat: Don't use _pipe when building for winstore
+
+---
+ compat/compat.h | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/compat/compat.h b/compat/compat.h
+index 4eef355..b7f878c 100644
+--- a/compat/compat.h
 b/compat/compat.h
+@@ -66,13 +66,18 @@ char *strndup(const char *str, size_t n);
+ #endif
+ 
+ #if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
+-#include 
+-#define HAVE_PIPE
++# ifdef _WIN32
++#  include 
++# endif
++# if !defined(_WIN32) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
++#  include 
++#  define HAVE_PIPE
+ static inline int pipe(int fds[2])
+ {
+ return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
+ }
+ #endif
++#endif
+ 
+ #ifndef _WIN32
+ #define closesocket(fd) close(fd)
+-- 
+2.19.2
+
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 79a235333f..f5235be43f 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -23,6 +23,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(APPLY) 
$(SRC)/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
$(APPLY) $(SRC)/libdsm/fix-pc-generation.patch
$(APPLY) $(SRC)/libdsm/fix-pipe-compat.patch
+   $(APPLY) 
$(SRC)/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.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 depends on pthreads

2018-12-03 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Mon Dec  3 
14:19:54 2018 +0100| [03ad554ba54c4f8c006c786f3547a0b22ecaec80] | committer: 
Hugo Beauzée-Luyssen

contrib: libdsm depends on pthreads

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

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

diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index f5235be43f..1ea9b769b5 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -27,6 +27,9 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(MOVE)
 
 DEPS_libdsm = libtasn1 iconv
+ifdef HAVE_WIN32
+DEPS_libdsm += pthreads $(DEPS_pthreads)
+endif
 
 .libdsm: libdsm
$(RECONF)

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