[vlc-commits] vout: update priority rules

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec 20 21:07:52 2018 +0200| [c5bdc1bc704f8fcc80460166764c71aabd9f8080] | committer: Rémi Denis-Courmont

vout: update priority rules

This swaps SPU blending and chroma conversion.

On X11, XVideo gets demoted below RENDER.
On Win32, DirectDraw gets demoted, but retains its relative ranking.

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

 modules/video_output/README             | 6 +++---
 modules/video_output/win32/directdraw.c | 2 +-
 modules/video_output/xcb/xvideo.c       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/README b/modules/video_output/README
index cf1d8109ae..61a1f04c4d 100644
--- a/modules/video_output/README
+++ b/modules/video_output/README
@@ -4,14 +4,14 @@ Video output display plugins
 Priority rules
 ---------------
 
-The priorities ranges are as follows since December 2014:
+The priorities ranges are as follows since December 2018:
 
  - less than  20: console (text)
  - less than  50: plain frame buffers
  - less than 100: no embedded windowing
  - less than 150: SW scaling
- - less than 200: SW chroma conversion
- - less than 250: SW subpicture blending
+ - less than 200: SW subpicture blending
+ - less than 250: SW chroma conversion
  - rest: good stuff :-)
 
 No more than one plugin with a given non-zero riority.
diff --git a/modules/video_output/win32/directdraw.c b/modules/video_output/win32/directdraw.c
index 78670e6c17..c6a81989e7 100644
--- a/modules/video_output/win32/directdraw.c
+++ b/modules/video_output/win32/directdraw.c
@@ -115,7 +115,7 @@ vlc_module_begin()
     add_string("directx-device", "", DEVICE_TEXT, DEVICE_LONGTEXT, true)
         change_string_cb(FindDevicesCallback)
 
-    set_capability("vout display", 230)
+    set_capability("vout display", 180)
     add_shortcut("directx", "directdraw")
     set_callbacks(Open, Close)
 vlc_module_end()
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 37b3c59856..43cd6c6df1 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -64,7 +64,7 @@ vlc_module_begin ()
     set_description (N_("XVideo output (XCB)"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout display", 200)
+    set_capability ("vout display", 150)
     set_callbacks (Open, Close)
 
     add_integer ("xvideo-adaptor", -1,