mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

ximage: more fixes

Browse source
This commit is contained in:
Wim Taymans 2011-04-06 16:26:12 +02:00
parent 15c49a4d63
commit 518ededd16
2 changed files with 45 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sys/ximage/ximagesink.c
View file

@ -1164,7 +1164,8 @@ gst_ximagesink_change_state (GstElement * element, GstStateChange transition)
GST_VIDEO_SINK_WIDTH (ximagesink) = 0;
GST_VIDEO_SINK_HEIGHT (ximagesink) = 0;
g_mutex_lock (ximagesink->flow_lock);
gst_buffer_pool_set_active (ximagesink->pool, FALSE);
if (ximagesink->pool)
gst_buffer_pool_set_active (ximagesink->pool, FALSE);
g_mutex_unlock (ximagesink->flow_lock);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
@ -1206,6 +1207,8 @@ gst_ximagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
GstFlowReturn res;
GstXImageSink *ximagesink;
GstMetaXImage *meta;
GstBuffer *temp;
gboolean unref;
ximagesink = GST_XIMAGESINK (vsink);
@ -1216,8 +1219,8 @@ gst_ximagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
put the ximage which is in the PRIVATE pointer */
GST_LOG_OBJECT (ximagesink, "buffer from our pool, writing directly");
res = GST_FLOW_OK;
unref = FALSE;
} else {
GstBuffer *temp;
guint8 *data;
gsize size;
@ -1234,6 +1237,8 @@ gst_ximagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
if (res != GST_FLOW_OK)
goto no_buffer;
unref = TRUE;
if (gst_buffer_get_size (temp) < gst_buffer_get_size (buf))
goto wrong_size;
@ -1247,6 +1252,10 @@ gst_ximagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
if (!gst_ximagesink_ximage_put (ximagesink, buf))
goto no_window;
done:
if (unref)
gst_buffer_unref (buf);
return res;
/* ERRORS */
@ -1267,14 +1276,18 @@ wrong_size:
{
GST_ELEMENT_ERROR (ximagesink, RESOURCE, WRITE,
("Failed to create output image buffer"),
("XServer allocated buffer size did not match input buffer"));
return GST_FLOW_ERROR;
("XServer allocated buffer size did not match input buffer %"
G_GSIZE_FORMAT " - %" G_GSIZE_FORMAT, gst_buffer_get_size (temp),
gst_buffer_get_size (buf)));
res = GST_FLOW_ERROR;
goto done;
}
no_window:
{
/* No Window available to put our image into */
GST_WARNING_OBJECT (ximagesink, "could not output image - no window");
return GST_FLOW_ERROR;
res = GST_FLOW_ERROR;
goto done;
}
}

37
sys/xvimage/xvimagesink.c
View file

@ -1727,8 +1727,10 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
/* Initializing the XContext */
if (xvimagesink->xcontext == NULL) {
xcontext = gst_xvimagesink_xcontext_get (xvimagesink);
if (xcontext == NULL)
return GST_STATE_CHANGE_FAILURE;
if (xcontext == NULL) {
ret = GST_STATE_CHANGE_FAILURE;
goto beach;
}
GST_OBJECT_LOCK (xvimagesink);
if (xcontext)
xvimagesink->xcontext = xcontext;
@ -1769,8 +1771,9 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
GST_VIDEO_SINK_WIDTH (xvimagesink) = 0;
GST_VIDEO_SINK_HEIGHT (xvimagesink) = 0;
g_mutex_lock (xvimagesink->flow_lock);
gst_buffer_pool_set_active (xvimagesink->pool, FALSE);
g_mutex_lock (xvimagesink->flow_lock);
if (xvimagesink->pool)
gst_buffer_pool_set_active (xvimagesink->pool, FALSE);
g_mutex_unlock (xvimagesink->flow_lock);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
gst_xvimagesink_reset (xvimagesink);
@ -1779,6 +1782,7 @@ gst_xvimagesink_change_state (GstElement * element, GstStateChange transition)
break;
}
beach:
return ret;
}
@ -1810,6 +1814,8 @@ gst_xvimagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
GstFlowReturn res;
GstXvImageSink *xvimagesink;
GstMetaXvImage *meta;
GstBuffer *temp;
gboolean unref;
xvimagesink = GST_XVIMAGESINK (vsink);
@ -1820,13 +1826,11 @@ gst_xvimagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
put the ximage which is in the PRIVATE pointer */
GST_LOG_OBJECT (xvimagesink, "buffer from our pool, writing directly");
res = GST_FLOW_OK;
unref = FALSE;
} else {
GstBuffer *temp;
guint8 *data;
gsize size;
GST_CAT_LOG_OBJECT (GST_CAT_PERFORMANCE, xvimagesink,
"slow copy into bufferpool buffer %p", buf);
/* Else we have to copy the data into our private image, */
/* if we have one... */
GST_LOG_OBJECT (xvimagesink, "buffer not from our pool, copying");
@ -1840,6 +1844,11 @@ gst_xvimagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
if (res != GST_FLOW_OK)
goto no_buffer;
GST_CAT_LOG_OBJECT (GST_CAT_PERFORMANCE, xvimagesink,
"slow copy into bufferpool buffer %p", temp);
unref = TRUE;
if (gst_buffer_get_size (temp) < gst_buffer_get_size (buf))
goto wrong_size;
@ -1853,6 +1862,10 @@ gst_xvimagesink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
if (!gst_xvimagesink_xvimage_put (xvimagesink, buf))
goto no_window;
done:
if (unref)
gst_buffer_unref (buf);
return res;
/* ERRORS */
@ -1873,14 +1886,18 @@ wrong_size:
{
GST_ELEMENT_ERROR (xvimagesink, RESOURCE, WRITE,
("Failed to create output image buffer"),
("XServer allocated buffer size did not match input buffer"));
return GST_FLOW_ERROR;
("XServer allocated buffer size did not match input buffer %"
G_GSIZE_FORMAT " - %" G_GSIZE_FORMAT, gst_buffer_get_size (temp),
gst_buffer_get_size (buf)));
res = GST_FLOW_ERROR;
goto done;
}
no_window:
{
/* No Window available to put our image into */
GST_WARNING_OBJECT (xvimagesink, "could not output image - no window");
return GST_FLOW_ERROR;
res = GST_FLOW_ERROR;
goto done;
}
}