mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

ximage: more fixes

Browse source
This commit is contained in:
Wim Taymans 2011-04-06 17:54:28 +02:00
parent 4007076b55
commit 1ae67927cc
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/ximage/ximagepool.c
View file

@ -291,6 +291,8 @@ gst_meta_ximage_free (GstMetaXImage * meta, GstBuffer * buffer)
beach: beach:
GST_OBJECT_UNLOCK (ximagesink); GST_OBJECT_UNLOCK (ximagesink);
gst_object_unref (meta->sink);
} }
GstBuffer * GstBuffer *

2
sys/xvimage/xvimagepool.c
View file

@ -325,6 +325,8 @@ gst_meta_xvimage_free (GstMetaXvImage * meta, GstBuffer * buffer)
beach: beach:
GST_OBJECT_UNLOCK (xvimagesink); GST_OBJECT_UNLOCK (xvimagesink);
gst_object_unref (meta->sink);
} }
GstBuffer * GstBuffer *

4
sys/xvimage/xvimagesink.c
View file

@ -314,8 +314,7 @@ gst_xvimagesink_xvimage_put (GstXvImageSink * xvimagesink, GstBuffer * xvimage)
if (xvimagesink->xcontext->use_xshm) { if (xvimagesink->xcontext->use_xshm) {
GST_LOG_OBJECT (xvimagesink, GST_LOG_OBJECT (xvimagesink,
"XvShmPutImage with image %dx%d and window %dx%d, from xvimage %" "XvShmPutImage with image %dx%d and window %dx%d, from xvimage %"
GST_PTR_FORMAT, GST_PTR_FORMAT, meta->width, meta->height,
meta->width, meta->height,
xvimagesink->render_rect.w, xvimagesink->render_rect.h, xvimage); xvimagesink->render_rect.w, xvimagesink->render_rect.h, xvimage);
XvShmPutImage (xvimagesink->xcontext->disp, XvShmPutImage (xvimagesink->xcontext->disp,
@ -2331,6 +2330,7 @@ gst_xvimagesink_expose (GstXOverlay * overlay)
{ {
GstXvImageSink *xvimagesink = GST_XVIMAGESINK (overlay); GstXvImageSink *xvimagesink = GST_XVIMAGESINK (overlay);
GST_DEBUG ("doing expose");
gst_xvimagesink_xwindow_update_geometry (xvimagesink); gst_xvimagesink_xwindow_update_geometry (xvimagesink);
gst_xvimagesink_xvimage_put (xvimagesink, NULL); gst_xvimagesink_xvimage_put (xvimagesink, NULL);
} }

1
sys/xvimage/xvimagesink.h
View file

@ -208,7 +208,6 @@ struct _GstXvImageSink
GstXContext *xcontext; GstXContext *xcontext;
GstXWindow *xwindow; GstXWindow *xwindow;
GstBuffer *xvimage;
GstBuffer *cur_image; GstBuffer *cur_image;
GThread *event_thread; GThread *event_thread;