Align the allocated memory to 16 bytes. When doing XSHM we are already aligned
to a page boundary but without, we use plain g_malloc, which could allocate
aligned on 8 bytes only.
See https://bugzilla.gnome.org/show_bug.cgi?id=680796
gboolean success = FALSE;
GstXContext *xcontext;
GstXImageMeta *meta;
gboolean success = FALSE;
GstXContext *xcontext;
GstXImageMeta *meta;
+ gint width, height, align = 15, offset;
GstXImageBufferPoolPrivate *priv;
priv = xpool->priv;
GstXImageBufferPoolPrivate *priv;
priv = xpool->priv;
meta->size, width, meta->ximage->bytes_per_line);
/* get shared memory */
meta->size, width, meta->ximage->bytes_per_line);
/* get shared memory */
- meta->SHMInfo.shmid = shmget (IPC_PRIVATE, meta->size, IPC_CREAT | 0777);
+ meta->SHMInfo.shmid =
+ shmget (IPC_PRIVATE, meta->size + align, IPC_CREAT | 0777);
if (meta->SHMInfo.shmid == -1)
goto shmget_failed;
if (meta->SHMInfo.shmid == -1)
goto shmget_failed;
allocsize =
GST_ROUND_UP_4 (meta->ximage->bytes_per_line) * meta->ximage->height;
allocsize =
GST_ROUND_UP_4 (meta->ximage->bytes_per_line) * meta->ximage->height;
- meta->ximage->data = g_malloc (allocsize);
+ meta->ximage->data = g_malloc (allocsize + align);
GST_LOG_OBJECT (ximagesink,
"non-XShm image size is %" G_GSIZE_FORMAT " (alloced: %u), width %d, "
"stride %d", meta->size, allocsize, width,
GST_LOG_OBJECT (ximagesink,
"non-XShm image size is %" G_GSIZE_FORMAT " (alloced: %u), width %d, "
"stride %d", meta->size, allocsize, width,
XSync (xcontext->disp, FALSE);
}
XSync (xcontext->disp, FALSE);
}
+ if ((offset = ((guintptr) meta->ximage->data & align)))
+ offset = (align + 1) - offset;
+
+ GST_DEBUG_OBJECT (ximagesink, "memory %p, align %d, offset %d",
+ meta->ximage->data, align, offset);
+
/* Reset error handler */
error_caught = FALSE;
XSetErrorHandler (handler);
gst_buffer_append_memory (buffer,
gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, meta->ximage->data,
/* Reset error handler */
error_caught = FALSE;
XSetErrorHandler (handler);
gst_buffer_append_memory (buffer,
gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, meta->ximage->data,
- meta->size, 0, meta->size, NULL, NULL));
+ meta->size + align, offset, meta->size, NULL, NULL));
g_mutex_unlock (ximagesink->x_lock);
g_mutex_unlock (ximagesink->x_lock);
gboolean success = FALSE;
GstXContext *xcontext;
GstXvImageMeta *meta;
gboolean success = FALSE;
GstXContext *xcontext;
GstXvImageMeta *meta;
- gint width, height, im_format;
+ gint width, height, im_format, align = 15, offset;
GstXvImageBufferPoolPrivate *priv;
priv = xvpool->priv;
GstXvImageBufferPoolPrivate *priv;
priv = xvpool->priv;
}
/* get shared memory */
}
/* get shared memory */
- meta->SHMInfo.shmid = shmget (IPC_PRIVATE, meta->size, IPC_CREAT | 0777);
+ meta->SHMInfo.shmid =
+ shmget (IPC_PRIVATE, meta->size + align, IPC_CREAT | 0777);
if (meta->SHMInfo.shmid == -1)
goto shmget_failed;
if (meta->SHMInfo.shmid == -1)
goto shmget_failed;
/* we have to use the returned data_size for our image size */
meta->size = meta->xvimage->data_size;
/* we have to use the returned data_size for our image size */
meta->size = meta->xvimage->data_size;
- meta->xvimage->data = g_malloc (meta->size);
+ meta->xvimage->data = g_malloc (meta->size + align);
XSync (xcontext->disp, FALSE);
}
XSync (xcontext->disp, FALSE);
}
+ if ((offset = ((guintptr) meta->xvimage->data & align)))
+ offset = (align + 1) - offset;
+
+ GST_DEBUG_OBJECT (xvimagesink, "memory %p, align %d, offset %d",
+ meta->xvimage->data, align, offset);
+
/* Reset error handler */
error_caught = FALSE;
XSetErrorHandler (handler);
gst_buffer_append_memory (buffer,
gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, meta->xvimage->data,
/* Reset error handler */
error_caught = FALSE;
XSetErrorHandler (handler);
gst_buffer_append_memory (buffer,
gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, meta->xvimage->data,
- meta->size, 0, meta->size, NULL, NULL));
+ meta->size + align, offset, meta->size, NULL, NULL));
g_mutex_unlock (xvimagesink->x_lock);
g_mutex_unlock (xvimagesink->x_lock);