vout: update priority rules to account for SPU blending

This moves Direct3D on Windows (with no effects on actual order) and
OpenGL on Linux/BSD (now exceeding XVideo thanks shaders and blending).

It remains to be decided whether OpenGL should be increased on Windows;
in principles, it should have a higher priority than D2D and DDraw.

diff --git a/modules/video_output/README b/modules/video_output/README
index c4feb1ae608d37987f30ce308cb57ca40f22903c..cf1d8109aed428d00bbd3d09eb14911a6a363677 100644 (file)
--- a/modules/video_output/README
+++ b/modules/video_output/README
@@ -4,13 +4,14 @@ Video output display plugins
 Priority rules
 ---------------
 
-The priorities ranges are as follows since February 2011:
+The priorities ranges are as follows since December 2014:
 
  - 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
  - rest: good stuff :-)
 
 No more than one plugin with a given non-zero riority.

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index a2d97a0aef5bcedbd36c7220bda5d2409b4ac9d6..392ffa183544c6dc277c5dd9a449f23558560968 100644 (file)
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -49,7 +49,7 @@ vlc_module_begin ()
 # define MODULE_VARNAME "gles2"
     set_shortname (N_("OpenGL ES2"))
     set_description (N_("OpenGL for Embedded Systems 2 video output"))
-    set_capability ("vout display", /*165*/0)
+    set_capability ("vout display", /*265*/0)
     set_callbacks (Open, Close)
     add_shortcut ("opengles2", "gles2")
     add_module ("gles2", "opengl es2", NULL,
@@ -60,7 +60,7 @@ vlc_module_begin ()
 # define MODULE_VARNAME "gles"
     set_shortname (N_("OpenGL ES"))
     set_description (N_("OpenGL for Embedded Systems video output"))
-    set_capability ("vout display", /*160*/0)
+    set_capability ("vout display", /*260*/0)
     set_callbacks (Open, Close)
     add_shortcut ("opengles", "gles")
     add_module ("gles", "opengl es", NULL,
@@ -72,7 +72,7 @@ vlc_module_begin ()
     set_description (N_("OpenGL video output (experimental)"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout display", /*170*/0)
+    set_capability ("vout display", /*270*/0)
     set_callbacks (Open, Close)
     add_shortcut ("opengl", "gl")
     add_module ("gl", "opengl", NULL,

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 6e141f4b9d92819624e1c1a25c673e2b99a4ce40..73b0f44856203c6ac7ecbcdebe04d60641bd47b9 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -89,7 +89,7 @@ vlc_module_begin ()
         change_string_cb(FindShadersCallback)
     add_loadfile("direct3d-shader-file", NULL, PIXEL_SHADER_FILE_TEXT, PIXEL_SHADER_FILE_LONGTEXT, false)
 
-    set_capability("vout display", 240)
+    set_capability("vout display", 280)
     add_shortcut("direct3d")
     set_callbacks(Open, Close)
 

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index ced6a177ff4323fa82ccd0fbb0cdcdbf283adb02..bb5c789f4e5b6f639bf54cd8ca8ceebdc91bc9c1 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -49,7 +49,7 @@ vlc_module_begin ()
     set_description (N_("OpenGL GLX video output (XCB)"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout display", 150)
+    set_capability ("vout display", 250)
     set_callbacks (Open, Close)
 
     add_shortcut ("xcb-glx", "glx", "opengl", "xid")