Commit 378ac85a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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.
parent b2ff0fbc
...@@ -4,13 +4,14 @@ Video output display plugins ...@@ -4,13 +4,14 @@ Video output display plugins
Priority rules 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 20: console (text)
- less than 50: plain frame buffers - less than 50: plain frame buffers
- less than 100: no embedded windowing - less than 100: no embedded windowing
- less than 150: SW scaling - less than 150: SW scaling
- less than 200: SW chroma conversion - less than 200: SW chroma conversion
- less than 250: SW subpicture blending
- rest: good stuff :-) - rest: good stuff :-)
No more than one plugin with a given non-zero riority. No more than one plugin with a given non-zero riority.
......
...@@ -49,7 +49,7 @@ vlc_module_begin () ...@@ -49,7 +49,7 @@ vlc_module_begin ()
# define MODULE_VARNAME "gles2" # define MODULE_VARNAME "gles2"
set_shortname (N_("OpenGL ES2")) set_shortname (N_("OpenGL ES2"))
set_description (N_("OpenGL for Embedded Systems 2 video output")) 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) set_callbacks (Open, Close)
add_shortcut ("opengles2", "gles2") add_shortcut ("opengles2", "gles2")
add_module ("gles2", "opengl es2", NULL, add_module ("gles2", "opengl es2", NULL,
...@@ -60,7 +60,7 @@ vlc_module_begin () ...@@ -60,7 +60,7 @@ vlc_module_begin ()
# define MODULE_VARNAME "gles" # define MODULE_VARNAME "gles"
set_shortname (N_("OpenGL ES")) set_shortname (N_("OpenGL ES"))
set_description (N_("OpenGL for Embedded Systems video output")) 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) set_callbacks (Open, Close)
add_shortcut ("opengles", "gles") add_shortcut ("opengles", "gles")
add_module ("gles", "opengl es", NULL, add_module ("gles", "opengl es", NULL,
...@@ -72,7 +72,7 @@ vlc_module_begin () ...@@ -72,7 +72,7 @@ vlc_module_begin ()
set_description (N_("OpenGL video output (experimental)")) set_description (N_("OpenGL video output (experimental)"))
set_category (CAT_VIDEO) set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT) set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", /*170*/0) set_capability ("vout display", /*270*/0)
set_callbacks (Open, Close) set_callbacks (Open, Close)
add_shortcut ("opengl", "gl") add_shortcut ("opengl", "gl")
add_module ("gl", "opengl", NULL, add_module ("gl", "opengl", NULL,
......
...@@ -89,7 +89,7 @@ vlc_module_begin () ...@@ -89,7 +89,7 @@ vlc_module_begin ()
change_string_cb(FindShadersCallback) change_string_cb(FindShadersCallback)
add_loadfile("direct3d-shader-file", NULL, PIXEL_SHADER_FILE_TEXT, PIXEL_SHADER_FILE_LONGTEXT, false) 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") add_shortcut("direct3d")
set_callbacks(Open, Close) set_callbacks(Open, Close)
......
...@@ -49,7 +49,7 @@ vlc_module_begin () ...@@ -49,7 +49,7 @@ vlc_module_begin ()
set_description (N_("OpenGL GLX video output (XCB)")) set_description (N_("OpenGL GLX video output (XCB)"))
set_category (CAT_VIDEO) set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT) set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 150) set_capability ("vout display", 250)
set_callbacks (Open, Close) set_callbacks (Open, Close)
add_shortcut ("xcb-glx", "glx", "opengl", "xid") add_shortcut ("xcb-glx", "glx", "opengl", "xid")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment