* format. If a XCB connection pointer is supplied, the segment is attached to
* the X server (MIT-SHM extension).
*/
-int PictureInit (vout_thread_t *vout, picture_t *pic, xcb_connection_t *conn)
+int PictureAlloc (vout_thread_t *vout, picture_t *pic, size_t size,
+ xcb_connection_t *conn)
{
assert (pic->i_status == FREE_PICTURE);
- vout_InitPicture (vout, pic, vout->output.i_chroma,
- vout->output.i_width, vout->output.i_height,
- vout->output.i_aspect);
-
- const size_t size = pic->p->i_pitch * pic->p->i_lines;
/* Allocate shared memory segment */
int id = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700);
/**
* Release picture private data: detach the shared memory segment.
*/
-void PictureDeinit (picture_t *pic, xcb_connection_t *conn)
+void PictureFree (picture_t *pic, xcb_connection_t *conn)
{
xcb_shm_seg_t segment = (uintptr_t)pic->p_sys;
break;
if (pic->i_status != FREE_PICTURE)
continue;
- if (PictureInit (vout, pic, p_sys->shm ? p_sys->conn : NULL))
+
+ vout_InitPicture (vout, pic, vout->output.i_chroma,
+ vout->output.i_width, vout->output.i_height,
+ vout->output.i_aspect);
+ if (PictureAlloc (vout, pic, pic->p->i_pitch * pic->p->i_lines,
+ p_sys->shm ? p_sys->conn : NULL))
break;
PP_OUTPUTPICTURE[I_OUTPUTPICTURES++] = pic;
}
static void Deinit (vout_thread_t *vout)
{
for (int i = 0; i < I_OUTPUTPICTURES; i++)
- PictureDeinit (PP_OUTPUTPICTURE[i], vout->p_sys->conn);
+ PictureFree (PP_OUTPUTPICTURE[i], vout->p_sys->conn);
}
/**
bool *restrict pshm);
int GetWindowSize (struct vout_window_t *wnd, xcb_connection_t *conn,
unsigned *restrict width, unsigned *restrict height);
-int PictureInit (vout_thread_t *vout, picture_t *pic, xcb_connection_t *conn);
-void PictureDeinit (picture_t *pic, xcb_connection_t *conn);
+int PictureAlloc (vout_thread_t *, picture_t *, size_t, xcb_connection_t *);
+void PictureFree (picture_t *pic, xcb_connection_t *conn);
break;
if (pic->i_status != FREE_PICTURE)
continue;
- if (PictureInit (vout, pic, p_sys->shm ? p_sys->conn : NULL))
+
+ vout_InitPicture (vout, pic, vout->output.i_chroma,
+ vout->output.i_width, vout->output.i_height,
+ vout->output.i_aspect);
+ if (PictureAlloc (vout, pic, pic->p->i_pitch * pic->p->i_lines,
+ p_sys->shm ? p_sys->conn : NULL))
break;
PP_OUTPUTPICTURE[I_OUTPUTPICTURES++] = pic;
}
vout_sys_t *p_sys = vout->p_sys;
for (int i = 0; i < I_OUTPUTPICTURES; i++)
- PictureDeinit (PP_OUTPUTPICTURE[i], p_sys->conn);
+ PictureFree (PP_OUTPUTPICTURE[i], p_sys->conn);
}
/**