mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 15:48:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklinksrc: aggregate audio and video flow returns

Browse source 
And pause task in some more cases where we should
pause the task.
This commit is contained in:
Tim-Philipp Müller 2013-03-16 23:29:35 +00:00
parent 5dfc7c4bce
commit 929b0bc3e2
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
sys/decklink/gstdecklinksrc.cpp
View file

@ -734,7 +734,7 @@ gst_decklink_src_task (void *priv)
void *data; void *data;
gsize data_size; gsize data_size;
int n_samples; int n_samples;
GstFlowReturn ret; GstFlowReturn video_flow, audio_flow, flow;
const GstDecklinkMode *mode; const GstDecklinkMode *mode;
gboolean discont = FALSE; gboolean discont = FALSE;
@ -838,15 +838,7 @@ gst_decklink_src_task (void *priv)
else else
GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
/* FIXME: proper flow aggregation with audio flow */ video_flow = gst_pad_push (decklinksrc->videosrcpad, buffer);
ret = gst_pad_push (decklinksrc->videosrcpad, buffer);
if (!(ret == GST_FLOW_OK || ret == GST_FLOW_NOT_LINKED ||
ret == GST_FLOW_FLUSHING)) {
GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED,
("Internal data stream error."),
("stream stopped, reason %s", gst_flow_get_name (ret)));
goto pause;
}
if (gst_pad_is_linked (decklinksrc->audiosrcpad)) { if (gst_pad_is_linked (decklinksrc->audiosrcpad)) {
n_samples = audio_frame->GetSampleFrameCount (); n_samples = audio_frame->GetSampleFrameCount ();
@ -866,23 +858,35 @@ gst_decklink_src_task (void *priv)
decklinksrc->num_audio_samples += n_samples; decklinksrc->num_audio_samples += n_samples;
/* FIXME: proper flow aggregation with video flow */ audio_flow = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer);
ret = gst_pad_push (decklinksrc->audiosrcpad, audio_buffer); } else {
if (!(ret == GST_FLOW_OK || ret == GST_FLOW_NOT_LINKED || audio_flow = GST_FLOW_NOT_LINKED;
ret == GST_FLOW_FLUSHING)) {
GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED,
("Internal data stream error."),
("stream stopped, reason %s", gst_flow_get_name (ret)));
goto pause;
}
} }
if (audio_flow == GST_FLOW_NOT_LINKED)
flow = video_flow;
else if (video_flow == GST_FLOW_NOT_LINKED)
flow = audio_flow;
else if (video_flow == GST_FLOW_FLUSHING || audio_flow == GST_FLOW_FLUSHING)
flow = GST_FLOW_FLUSHING;
else if (video_flow < GST_FLOW_EOS)
flow = video_flow;
else if (audio_flow < GST_FLOW_EOS)
flow = audio_flow;
else if (video_flow == GST_FLOW_EOS || audio_flow == GST_FLOW_EOS)
flow = GST_FLOW_EOS;
else
flow = video_flow;
if (g_atomic_int_compare_and_exchange (&decklinksrc->pending_eos, TRUE, if (g_atomic_int_compare_and_exchange (&decklinksrc->pending_eos, TRUE,
FALSE)) { FALSE)) {
GST_INFO_OBJECT (decklinksrc, "EOS pending"); GST_INFO_OBJECT (decklinksrc, "EOS pending");
ret = GST_FLOW_EOS; flow = GST_FLOW_EOS;
} }
if (flow != GST_FLOW_OK)
goto pause;
done: done:
if (audio_frame) if (audio_frame)
@ -892,15 +896,15 @@ done:
pause: pause:
{ {
const gchar *reason = gst_flow_get_name (ret); const gchar *reason = gst_flow_get_name (flow);
GstEvent *event = NULL; GstEvent *event = NULL;
GST_DEBUG_OBJECT (decklinksrc, "pausing task, reason %s", reason); GST_DEBUG_OBJECT (decklinksrc, "pausing task, reason %s", reason);
gst_task_pause (decklinksrc->task); gst_task_pause (decklinksrc->task);
if (ret == GST_FLOW_EOS) { if (flow == GST_FLOW_EOS) {
/* perform EOS logic (very crude, we don't even keep a GstSegment) */ /* perform EOS logic (very crude, we don't even keep a GstSegment) */
event = gst_event_new_eos (); event = gst_event_new_eos ();
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) { } else if (flow == GST_FLOW_NOT_LINKED || flow < GST_FLOW_EOS) {
event = gst_event_new_eos (); event = gst_event_new_eos ();
/* for fatal errors we post an error message, post the error /* for fatal errors we post an error message, post the error
* first so the app knows about the error first. * first so the app knows about the error first.
@ -910,7 +914,7 @@ pause:
* a flushing seek. */ * a flushing seek. */
GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED, GST_ELEMENT_ERROR (decklinksrc, STREAM, FAILED,
("Internal data flow error."), ("Internal data flow error."),
("streaming task paused, reason %s (%d)", reason, ret)); ("streaming task paused, reason %s (%d)", reason, flow));
} }
if (event != NULL) { if (event != NULL) {
GST_INFO_OBJECT (decklinksrc->videosrcpad, "pushing EOS event"); GST_INFO_OBJECT (decklinksrc->videosrcpad, "pushing EOS event");