Commit 2c50a3d1 authored by Laurent Aimar's avatar Laurent Aimar

Extended vout_display_opengl_GetPool() to take the number of requested pictures.

The parameter is not yet used.
parent 9b678604
...@@ -182,8 +182,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned count) ...@@ -182,8 +182,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned count)
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
if (!sys->pool) if (!sys->pool)
sys->pool = vout_display_opengl_GetPool (sys->vgl); sys->pool = vout_display_opengl_GetPool (sys->vgl, count);
(void) count;
return sys->pool; return sys->pool;
} }
......
...@@ -210,10 +210,9 @@ void Close(vlc_object_t *this) ...@@ -210,10 +210,9 @@ void Close(vlc_object_t *this)
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 *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
VLC_UNUSED(requested_count);
if (!sys->pool) if (!sys->pool)
sys->pool = vout_display_opengl_GetPool (sys->vgl); sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
assert(sys->pool); assert(sys->pool);
return sys->pool; return sys->pool;
} }
......
...@@ -255,10 +255,9 @@ void Close(vlc_object_t *this) ...@@ -255,10 +255,9 @@ void Close(vlc_object_t *this)
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 *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
VLC_UNUSED(requested_count);
if (!sys->pool) if (!sys->pool)
sys->pool = vout_display_opengl_GetPool (sys->vgl); sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
assert(sys->pool); assert(sys->pool);
return sys->pool; return sys->pool;
} }
......
...@@ -170,10 +170,9 @@ static void Close(vlc_object_t *object) ...@@ -170,10 +170,9 @@ static void Close(vlc_object_t *object)
static picture_pool_t *Pool(vout_display_t *vd, unsigned count) static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
{ {
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
VLC_UNUSED(count);
if (!sys->pool) if (!sys->pool)
sys->pool = vout_display_opengl_GetPool(sys->vgl); sys->pool = vout_display_opengl_GetPool(sys->vgl, count);
return sys->pool; return sys->pool;
} }
......
...@@ -330,7 +330,7 @@ static void PictureUnlock(picture_t *picture) ...@@ -330,7 +330,7 @@ static void PictureUnlock(picture_t *picture)
} }
#endif #endif
picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl) picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned requested_count)
{ {
if (vgl->pool) if (vgl->pool)
return vgl->pool; return vgl->pool;
......
...@@ -58,7 +58,7 @@ typedef struct vout_display_opengl_t vout_display_opengl_t; ...@@ -58,7 +58,7 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vlc_gl_t *gl); vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vlc_gl_t *gl);
void vout_display_opengl_Delete(vout_display_opengl_t *vgl); void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl); picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
int vout_display_opengl_Prepare(vout_display_opengl_t *vgl, int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
picture_t *picture); picture_t *picture);
......
...@@ -458,10 +458,9 @@ static void *GetProcAddress (vlc_gl_t *gl, const char *name) ...@@ -458,10 +458,9 @@ static void *GetProcAddress (vlc_gl_t *gl, const char *name)
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 *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
(void)requested_count;
if (!sys->pool) if (!sys->pool)
sys->pool = vout_display_opengl_GetPool (sys->vgl); sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
return sys->pool; return sys->pool;
} }
......
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