mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-05 23:59:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/ximage/ximagesink.c: Some more fixes to image size calculation.

Browse source 
Original commit message from CVS:
2004-07-26  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new): Some more fixes to image size calculation.
This commit is contained in:
Julien Moutte 2004-07-26 21:07:33 +00:00
parent 14331713ed
commit 745e6365b0
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-07-26 Julien MOUTTE <julien@moutte.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new): Some more fixes to image size calculation.
2004-07-26 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/level/gstlevel.c: (gst_level_link), (gst_level_chain),

13
sys/ximage/ximagesink.c
View file

@ -116,14 +116,13 @@ gst_ximagesink_check_xshm_calls (GstXContext * xcontext)
error_caught = FALSE;
handler = XSetErrorHandler (gst_ximagesink_handle_xerror);
ximage->size = (xcontext->bpp / 8);
/* Trying to create a 1x1 picture */
ximage->ximage = XShmCreateImage (xcontext->disp, xcontext->visual,
xcontext->depth, ZPixmap, NULL, &ximage->SHMInfo, 1, 1);
if (!ximage->ximage)
goto out;
ximage->size = ximage->ximage->bytes_per_line;
ximage->SHMInfo.shmid = shmget (IPC_PRIVATE, ximage->size, IPC_CREAT | 0777);
ximage->SHMInfo.shmaddr = shmat (ximage->SHMInfo.shmid, 0, 0);
ximage->ximage->data = ximage->SHMInfo.shmaddr;
@ -172,11 +171,6 @@ gst_ximagesink_ximage_new (GstXImageSink * ximagesink, gint width, gint height)
g_mutex_lock (ximagesink->x_lock);
ximage->size =
(ximagesink->xcontext->bpp / 8) * ximage->width * ximage->height;
GST_DEBUG_OBJECT (ximagesink, "GStreamer's image size is %d, stride %d",
ximage->size, ximage->size / ximage->height);
#ifdef HAVE_XSHM
if (ximagesink->xcontext->use_xshm) {
ximage->ximage = XShmCreateImage (ximagesink->xcontext->disp,
@ -209,10 +203,9 @@ gst_ximagesink_ximage_new (GstXImageSink * ximagesink, gint width, gint height)
ximagesink->xcontext->visual,
ximagesink->xcontext->depth,
ZPixmap, 0, NULL,
ximage->width, ximage->height,
ximagesink->xcontext->bpp, ximage->size / ximage->height);
ximage->width, ximage->height, ximagesink->xcontext->bpp, 0);
/* we passed a bytes_per_line, so we know the size */
ximage->size = ximage->ximage->bytes_per_line * ximage->ximage->height;
ximage->ximage->data = g_malloc (ximage->size);
XSync (ximagesink->xcontext->disp, FALSE);