slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emit connection-failed signal if gst_pad_alloc_buffer fails.

Browse Source 
Buffer allocation might fail for requested format.
We need to emit connection-failed signal
and allow backend to insert colorspace transformation element.

Change-Id: I9a101bb3c027f150c68bbeaba8ab932deded47ea
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-04-17 14:44:49 +10:00
committed by Qt by Nokia
parent 3998106d93
commit 1a71385d6a
1 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/plugins/gstreamer/gstvideoconnector.c
View File

@@ -200,47 +200,59 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size,
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
*buf = NULL; *buf = NULL;
GST_OBJECT_LOCK (element); gboolean isFailed = FALSE;
gst_object_ref(element->srcpad); while (1) {
GST_OBJECT_UNLOCK (element); GST_OBJECT_LOCK (element);
gst_object_ref(element->srcpad);
GST_OBJECT_UNLOCK (element);
// Check if downstream element is in NULL state // Check if downstream element is in NULL state
// and wait for up to 1 second for it to switch. // and wait for up to 1 second for it to switch.
GstPad *peerPad = gst_pad_get_peer(element->srcpad); GstPad *peerPad = gst_pad_get_peer(element->srcpad);
if (peerPad) { if (peerPad) {
GstElement *parent = gst_pad_get_parent_element(peerPad); GstElement *parent = gst_pad_get_parent_element(peerPad);
gst_object_unref (peerPad); gst_object_unref (peerPad);
if (parent) { if (parent) {
GstState state; GstState state;
GstState pending; GstState pending;
int totalTimeout = 0; int totalTimeout = 0;
// This seems to sleep for about 10ms usually. // This seems to sleep for about 10ms usually.
while (totalTimeout < 1000000) { while (totalTimeout < 1000000) {
gst_element_get_state(parent, &state, &pending, 0); gst_element_get_state(parent, &state, &pending, 0);
if (state != GST_STATE_NULL) if (state != GST_STATE_NULL)
break; break;
usleep(5000); usleep(5000);
totalTimeout += 5000; totalTimeout += 5000;
} }
gst_object_unref (parent); gst_object_unref (parent);
if (state == GST_STATE_NULL) { if (state == GST_STATE_NULL) {
GST_DEBUG_OBJECT (element, "Downstream element is in NULL state"); GST_DEBUG_OBJECT (element, "Downstream element is in NULL state");
// Downstream filter seems to be in the wrong state // Downstream filter seems to be in the wrong state
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
}
} }
} }
}
res = gst_pad_alloc_buffer(element->srcpad, offset, size, caps, buf); res = gst_pad_alloc_buffer(element->srcpad, offset, size, caps, buf);
gst_object_unref (element->srcpad); gst_object_unref (element->srcpad);
GST_DEBUG_OBJECT (element, "buffer alloc finished: %s", gst_flow_get_name (res)); GST_DEBUG_OBJECT (element, "buffer alloc finished: %s", gst_flow_get_name (res));
if (res == GST_FLOW_WRONG_STATE) { if (res == GST_FLOW_WRONG_STATE) {
// Just in case downstream filter is still somehow in the wrong state. // Just in case downstream filter is still somehow in the wrong state.
// Pipeline stalls if we report GST_FLOW_WRONG_STATE. // Pipeline stalls if we report GST_FLOW_WRONG_STATE.
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
}
if (res >= GST_FLOW_OK || isFailed == TRUE)
break;
//if gst_pad_alloc_buffer failed, emit "connection-failed" signal
//so colorspace transformation element can be inserted
GST_INFO_OBJECT(element, "gst_video_connector_buffer_alloc failed, emit connection-failed signal");
g_signal_emit(G_OBJECT(element), gst_video_connector_signals[SIGNAL_CONNECTION_FAILED], 0);
isFailed = TRUE;
} }
return res; return res;
@@ -259,7 +271,7 @@ gst_video_connector_setcaps (GstPad *pad, GstCaps *caps)
if (!res) { if (!res) {
//if set_caps failed, emit "connection-failed" signal //if set_caps failed, emit "connection-failed" signal
//so colorspace transformation elemnt can be inserted //so colorspace transformation element can be inserted
GST_INFO_OBJECT(element, "gst_video_connector_setcaps failed, emit connection-failed signal"); GST_INFO_OBJECT(element, "gst_video_connector_setcaps failed, emit connection-failed signal");
g_signal_emit(G_OBJECT(element), gst_video_connector_signals[SIGNAL_CONNECTION_FAILED], 0); g_signal_emit(G_OBJECT(element), gst_video_connector_signals[SIGNAL_CONNECTION_FAILED], 0);