mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

resindvd: Simplify some stuff. Remove an unnecessary LOG message.

Browse source 
Skip attempting to schedule a nav block unless we're in PLAYING. Take a lock
slightly later, when we actually need it. Remove a noisy LOG message.
This commit is contained in:
Jan Schmidt 2009-05-08 16:06:01 +01:00
parent 9f01bd6434
commit f2f79cd410
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/resindvd/resindvdsrc.c
View file

@ -665,7 +665,7 @@ rsn_dvdsrc_do_still (resinDvdSrc * src, int duration)
/* FIXME: Implement timed stills by sleeping on the clock, possibly /* FIXME: Implement timed stills by sleeping on the clock, possibly
* in multiple steps if we get paused/unpaused */ * in multiple steps if we get paused/unpaused */
g_mutex_unlock (src->dvd_lock); g_mutex_unlock (src->dvd_lock);
GST_LOG_OBJECT (src, "cond_timed_wait still"); GST_LOG_OBJECT (src, "cond_timed_wait still for %d sec", duration);
was_signalled = was_signalled =
g_cond_timed_wait (src->still_cond, src->branch_lock, &end_time); g_cond_timed_wait (src->still_cond, src->branch_lock, &end_time);
was_signalled |= src->branching; was_signalled |= src->branching;
@ -2109,19 +2109,19 @@ rsn_dvdsrc_nav_clock_cb (GstClock * clock, GstClockTime time, GstClockID id,
return TRUE; return TRUE;
} }
/* Called with dvd_lock held */
static void static void
rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav) rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav)
{ {
GstClock *clock; GstClock *clock;
GstClockTime base_ts; GstClockTime base_ts;
GST_OBJECT_LOCK (src);
if (!src->in_playing) { if (!src->in_playing) {
GST_LOG_OBJECT (src, "Not scheduling NAV block - state != PLAYING"); GST_LOG_OBJECT (src, "Not scheduling NAV block - state != PLAYING");
GST_OBJECT_UNLOCK (src);
return; /* Not in playing state yet */ return; /* Not in playing state yet */
} }
GST_OBJECT_LOCK (src);
clock = GST_ELEMENT_CLOCK (src); clock = GST_ELEMENT_CLOCK (src);
base_ts = GST_ELEMENT (src)->base_time; base_ts = GST_ELEMENT (src)->base_time;
@ -2144,6 +2144,7 @@ rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src, RsnDvdPendingNav * next_nav)
gst_object_unref (clock); gst_object_unref (clock);
} }
/* Called with dvd_lock held */
static void static void
rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src) rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src)
{ {
@ -2154,9 +2155,10 @@ rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src)
return; /* Something already scheduled */ return; /* Something already scheduled */
} }
if (src->pending_nav_blocks == NULL) { if (src->pending_nav_blocks == NULL) {
GST_LOG_OBJECT (src, "No NAV blocks to schedule");
return; /* No nav blocks available yet */ return; /* No nav blocks available yet */
} }
if (!src->in_playing)
return; /* Not in playing state yet */
GST_LOG_OBJECT (src, "Installing NAV callback"); GST_LOG_OBJECT (src, "Installing NAV callback");
next_nav = (RsnDvdPendingNav *) src->pending_nav_blocks->data; next_nav = (RsnDvdPendingNav *) src->pending_nav_blocks->data;
@ -2164,8 +2166,6 @@ rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src)
rsn_dvdsrc_schedule_nav_cb (src, next_nav); rsn_dvdsrc_schedule_nav_cb (src, next_nav);
} }
/* Use libdvdread to read and cache info from the IFO file about
* streams in each VTS */
static gboolean static gboolean
rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event) rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event)
{ {