diff options
| author | Thibault Saunier <thibault.saunier@collabora.com> | 2013-05-23 21:09:58 -0400 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@collabora.com> | 2013-05-23 21:11:09 -0400 |
| commit | 15d523e28b320649a77d259dca52c7e53ea11e8b (patch) | |
| tree | 19b549e0055e1b45eb05f14c0e4354094ea9ec21 /gnl/gnlcomposition.c | |
| parent | 9db8b0211bf64137ff3215b78172fe76de1994a1 (diff) | |
Revert "composition: Foward eos from the streaming thread when appropriate"
This reverts commit 9db8b0211bf64137ff3215b78172fe76de1994a1.
This should be implemented properly using our knowledge of the
composition's content
Diffstat (limited to 'gnl/gnlcomposition.c')
| -rw-r--r-- | gnl/gnlcomposition.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c index 98079fb..7107e7f 100644 --- a/gnl/gnlcomposition.c +++ b/gnl/gnlcomposition.c @@ -735,8 +735,6 @@ ghost_event_probe_handler (GstPad * ghostpad G_GNUC_UNUSED, break; case GST_EVENT_EOS: { - GstClockTime duration, curpos; - COMP_FLUSHING_LOCK (comp); if (priv->flushing) { GST_DEBUG_OBJECT (comp, "flushing, bailing out"); @@ -753,26 +751,13 @@ ghost_event_probe_handler (GstPad * ghostpad G_GNUC_UNUSED, g_source_remove (priv->pending_idle); } - /* Get current position */ - if ((curpos = get_current_position (comp)) != GST_CLOCK_TIME_NONE) { - - if (comp->priv->segment->rate >= 0.0) - duration = GNL_OBJECT (comp)->duration; - else - duration = 0; - - if (curpos != duration) { - /* FIXME : This should be switched to using a g_thread_create() instead - * of a g_idle_add(). EXTENSIVE TESTING AND ANALYSIS REQUIRED BEFORE - * DOING THE SWITCH !!! */ - priv->pending_idle = - g_idle_add ((GSourceFunc) eos_main_thread, (gpointer) comp); + /* FIXME : This should be switched to using a g_thread_create() instead + * of a g_idle_add(). EXTENSIVE TESTING AND ANALYSIS REQUIRED BEFORE + * DOING THE SWITCH !!! */ + priv->pending_idle = + g_idle_add ((GSourceFunc) eos_main_thread, (gpointer) comp); - retval = GST_PAD_PROBE_DROP; - } - } - GST_DEBUG_OBJECT (comp, "Got EOS for real, fowarding it"); - /* Else if it is real eos... send it downstream */ + retval = GST_PAD_PROBE_DROP; } break; default: |