Commit 3576b1fd authored by Laurent Aimar's avatar Laurent Aimar

Made XCB xvideo independant of VOUT_MAX_PICTURES.

The maximum number of surfaces it will allow is now 128, but the actual value
used is configured by the core (around 20-30 when DR is used, a few otherwise).
parent 8528c53a
...@@ -71,7 +71,7 @@ vlc_module_begin () ...@@ -71,7 +71,7 @@ vlc_module_begin ()
add_shortcut ("xvideo") add_shortcut ("xvideo")
vlc_module_end () vlc_module_end ()
#define MAX_PICTURES (VOUT_MAX_PICTURES) #define MAX_PICTURES (128)
struct vout_display_sys_t struct vout_display_sys_t
{ {
...@@ -586,7 +586,6 @@ static void Close (vlc_object_t *obj) ...@@ -586,7 +586,6 @@ static void Close (vlc_object_t *obj)
static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count)
{ {
vout_display_sys_t *p_sys = vd->sys; vout_display_sys_t *p_sys = vd->sys;
(void)requested_count;
if (!p_sys->pool) if (!p_sys->pool)
{ {
...@@ -600,8 +599,10 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) ...@@ -600,8 +599,10 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count)
unsigned count; unsigned count;
picture_t *pic_array[MAX_PICTURES]; picture_t *pic_array[MAX_PICTURES];
for (count = 0; count < MAX_PICTURES; count++) for (count = 0; count < requested_count; count++)
{ {
if (count >= MAX_PICTURES)
break;
picture_resource_t *res = &p_sys->resource[count]; picture_resource_t *res = &p_sys->resource[count];
for (int i = 0; i < __MIN (p_sys->att->num_planes, PICTURE_PLANE_MAX); i++) for (int i = 0; i < __MIN (p_sys->att->num_planes, PICTURE_PLANE_MAX); i++)
......
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