Commit 73d27a4e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rationalize video output priorities

This tries to prioritize stuff a little better and more uniformly:

 - 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
 - rest: good stuff :-)

This removes multiple plugins with identical priorities. On Windows,
native outputs are now priorized over XCB (as there now is a Win32 port
of XCB). The ordering amongst native Windows outputs is preserved.
On X11, GLX is put ahead of plain as it supports scaling. SDL and
DirectFB are demoted as they cannot be embedded.

Old order:

 - XCB XVideo
 - Windows Direct3D (Vista+)
 - Windows DirectX
 - XCB X11
 - Windows Direct3D (XP-)
 - Windows Direct2D
 - DirectFB, SDL
 - XCB GLX
 - Linux FB
 - Windows GL - Windows GAPI
 - Colored ASCII Art
 - ASCII Art - Windows GDI

New order:

 - Windows Direct3D (Vista+)
 - Windows DirectX
 - Windows Direct3D (XP-)
 - XCB XVideo

 - Windows Direct2D
 - Windows GL
 - XCB GLX

 - Windows GAPI
 - Windows GDI
 - XCB X11

 - SDL
 - DirectFB
 - Linux FB

 - Colored ASCII Art
 - ASCII Art
parent 6db8a8fa
......@@ -48,7 +48,7 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_description(N_("Color ASCII art video output"))
set_capability("vout display", 12)
set_capability("vout display", 15)
set_callbacks(Open, Close)
vlc_module_end()
......
......@@ -47,7 +47,7 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_description(N_("DirectFB video output http://www.directfb.org/"))
set_capability("vout display", 60)
set_capability("vout display", 35)
add_shortcut("directfb")
set_callbacks(Open, Close)
vlc_module_end()
......
......@@ -61,7 +61,7 @@ vlc_module_begin ()
set_help(D2D_HELP)
set_shortname("Direct2D")
set_description(N_("Direct2D video output"))
set_capability("vout display", 65)
set_capability("vout display", 160)
add_shortcut("direct2d")
set_callbacks(Open, Close)
vlc_module_end ()
......
......@@ -69,13 +69,13 @@ vlc_module_begin ()
add_bool("direct3d-desktop", false, DESKTOP_TEXT, DESKTOP_LONGTEXT, true)
set_capability("vout display", 150)
set_capability("vout display", 240)
add_shortcut("direct3d")
set_callbacks(OpenVideoVista, Close)
add_submodule()
set_description(N_("Direct3D video output (XP)"))
set_capability("vout display", 70)
set_capability("vout display", 220)
add_shortcut("direct3d_xp")
set_callbacks(OpenVideoXP, Close)
......
......@@ -108,7 +108,7 @@ vlc_module_begin()
change_string_list(device, device_text, FindDevicesCallback)
change_action_add(FindDevicesCallback, N_("Refresh list"))
set_capability("vout display", 100)
set_capability("vout display", 230)
add_shortcut("directx")
set_callbacks(Open, Close)
vlc_module_end()
......
......@@ -53,7 +53,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_VIDEO_VOUT)
set_shortname("OpenGL")
set_description(N_("OpenGL video output"))
set_capability("vout display", 20)
set_capability("vout display", 160)
add_shortcut("glwin32", "opengl")
set_callbacks(Open, Close)
vlc_module_end()
......
......@@ -56,11 +56,11 @@ vlc_module_begin ()
#ifdef MODULE_NAME_IS_wingapi
set_shortname("GAPI")
set_description(N_("Windows GAPI video output"))
set_capability("vout display", 20)
set_capability("vout display", 120)
#else
set_shortname("GDI")
set_description(N_("Windows GDI video output"))
set_capability("vout display", 10)
set_capability("vout display", 110)
#endif
set_callbacks(Open, Close)
vlc_module_end ()
......
......@@ -63,7 +63,7 @@ vlc_module_begin()
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
set_description(N_("Simple DirectMedia Layer video output"))
set_capability("vout display", 60)
set_capability("vout display", 70)
add_shortcut("sdl")
add_string("sdl-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
add_obsolete_string("sdl-video-driver") /* obsolete since 1.1.0 */
......
......@@ -52,7 +52,7 @@ vlc_module_begin ()
set_description (N_("GLX video output (XCB)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 50)
set_capability ("vout display", 150)
set_callbacks (Open, Close)
add_shortcut ("xcb-glx", "glx", "opengl", "xid")
......
......@@ -48,7 +48,7 @@ vlc_module_begin ()
set_description (N_("X11 video output (XCB)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 75)
set_capability ("vout display", 100)
set_callbacks (Open, Close)
add_shortcut ("xcb-x11", "x11", "xid")
......
......@@ -60,7 +60,7 @@ vlc_module_begin ()
set_description (N_("XVideo output (XCB)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 155)
set_capability ("vout display", 200)
set_callbacks (Open, Close)
add_integer ("xvideo-adaptor", -1,
......
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