diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/resindvd/resindvdsrc.c | 47 | ||||
| -rw-r--r-- | ext/resindvd/resindvdsrc.h | 1 |
3 files changed, 35 insertions, 20 deletions
@@ -1,3 +1,10 @@ +2008-10-30 Jan Schmidt <jan.schmidt@sun.com> + + * ext/resindvd/resindvdsrc.c: + * ext/resindvd/resindvdsrc.h: + Better fix for #546319 and similar cases by explicitly + registering when we're in playing state or not. + 2008-10-30 Stefan Kost <ensonic@users.sf.net> * ext/ladspa/gstladspa.c: diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c index 9062c2aba..e651c9b42 100644 --- a/ext/resindvd/resindvdsrc.c +++ b/ext/resindvd/resindvdsrc.c @@ -130,10 +130,9 @@ static void rsn_dvdsrc_enqueue_nav_block (resinDvdSrc * src, static void rsn_dvdsrc_activate_nav_block (resinDvdSrc * src, GstBuffer * nav_buf); static void rsn_dvdsrc_clear_nav_blocks (resinDvdSrc * src); -static void rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src, - gboolean changing_to_playing); +static void rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src); static void rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, - RsnDvdPendingNav * next_nav, gboolean changing_to_playing); + RsnDvdPendingNav * next_nav); static GstFlowReturn rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** buf); static gboolean rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event); @@ -959,7 +958,7 @@ rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** outbuf) src->highlight_event = NULL; /* Schedule a clock callback for the any pending nav packet */ - rsn_dvdsrc_check_nav_blocks (src, FALSE); + rsn_dvdsrc_check_nav_blocks (src); g_mutex_unlock (src->dvd_lock); @@ -1619,7 +1618,7 @@ rsn_dvdsrc_nav_clock_cb (GstClock * clock, GstClockTime time, GstClockID id, /* Schedule a next packet, if any */ RsnDvdPendingNav *next_nav = (RsnDvdPendingNav *) src->pending_nav_blocks->data; - rsn_dvdsrc_schedule_nav_cb (src, next_nav, FALSE); + rsn_dvdsrc_schedule_nav_cb (src, next_nav); } g_mutex_unlock (src->dvd_lock); @@ -1628,14 +1627,13 @@ rsn_dvdsrc_nav_clock_cb (GstClock * clock, GstClockTime time, GstClockID id, } static void -rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav, - gboolean changing_to_playing) +rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav) { GstClock *clock; GstClockTime base_ts; GST_OBJECT_LOCK (src); - if (GST_STATE (src) != GST_STATE_PLAYING && !changing_to_playing) { + if (!src->in_playing) { GST_LOG_OBJECT (src, "Not scheduling NAV block - state != PLAYING"); GST_OBJECT_UNLOCK (src); return; /* Not in playing state yet */ @@ -1664,7 +1662,7 @@ rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav, } static void -rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src, gboolean changing_to_playing) +rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src) { RsnDvdPendingNav *next_nav; @@ -1680,7 +1678,7 @@ rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src, gboolean changing_to_playing) next_nav = (RsnDvdPendingNav *) src->pending_nav_blocks->data; - rsn_dvdsrc_schedule_nav_cb (src, next_nav, changing_to_playing); + rsn_dvdsrc_schedule_nav_cb (src, next_nav); } /* Use libdvdread to read and cache info from the IFO file about @@ -1711,20 +1709,12 @@ rsn_dvdsrc_change_state (GstElement * element, GstStateChange transition) GstStateChangeReturn ret; resinDvdSrc *src = RESINDVDSRC (element); - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - if (ret == GST_STATE_CHANGE_FAILURE) - return ret; - switch (transition) { - case GST_STATE_CHANGE_PAUSED_TO_PLAYING: - /* Kick off the NAV packet callback if needed */ - g_mutex_lock (src->dvd_lock); - rsn_dvdsrc_check_nav_blocks (src, TRUE); - g_mutex_unlock (src->dvd_lock); - break; case GST_STATE_CHANGE_PLAYING_TO_PAUSED: + GST_DEBUG_OBJECT (element, "Switching to PAUSED"); /* Unschedule any NAV packet callback */ g_mutex_lock (src->dvd_lock); + src->in_playing = FALSE; if (src->nav_clock_id) { gst_clock_id_unschedule (src->nav_clock_id); gst_clock_id_unref (src->nav_clock_id); @@ -1736,6 +1726,23 @@ rsn_dvdsrc_change_state (GstElement * element, GstStateChange transition) break; } + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + if (ret == GST_STATE_CHANGE_FAILURE) + return ret; + + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + GST_DEBUG_OBJECT (element, "Switching to PLAYING"); + /* Kick off the NAV packet callback if needed */ + g_mutex_lock (src->dvd_lock); + src->in_playing = TRUE; + rsn_dvdsrc_check_nav_blocks (src); + g_mutex_unlock (src->dvd_lock); + break; + default: + break; + } + return ret; } diff --git a/ext/resindvd/resindvdsrc.h b/ext/resindvd/resindvdsrc.h index c0fa8e1d7..ae88b134d 100644 --- a/ext/resindvd/resindvdsrc.h +++ b/ext/resindvd/resindvdsrc.h @@ -89,6 +89,7 @@ struct _resinDvdSrc gboolean need_segment; gboolean active_highlight; gboolean in_still_state; + gboolean in_playing; GstBuffer *alloc_buf; GstBuffer *next_buf; |