From 089daeba1b3bc7c1b2dde75ef1f3ca440783c95b Mon Sep 17 00:00:00 2001 From: David Corvoysier Date: Tue, 16 Oct 2012 11:26:03 +0200 Subject: [PATCH] Renamed demux->next_stream in demux->next_push --- ext/dash/gstdashdemux.c | 10 +++++----- ext/dash/gstdashdemux.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/dash/gstdashdemux.c b/ext/dash/gstdashdemux.c index ce6341d..71348b7 100644 --- a/ext/dash/gstdashdemux.c +++ b/ext/dash/gstdashdemux.c @@ -930,7 +930,7 @@ gst_dash_demux_stream_loop (GstDashDemux * demux) /* Wait until the next scheduled push downstream */ if (g_cond_timed_wait (GST_TASK_GET_COND (demux->stream_task), - demux->stream_timed_lock, &demux->next_stream)) { + demux->stream_timed_lock, &demux->next_push)) { goto pause_task; } @@ -985,12 +985,12 @@ gst_dash_demux_stream_loop (GstDashDemux * demux) } if (GST_STATE (demux) == GST_STATE_PLAYING) { /* Wait for the duration of a fragment before resuming this task */ - g_get_current_time (&demux->next_stream); - g_time_val_add (&demux->next_stream, + g_get_current_time (&demux->next_push); + g_time_val_add (&demux->next_push, gst_mpd_client_get_target_duration (demux->client) / GST_SECOND * G_USEC_PER_SEC); GST_DEBUG_OBJECT (demux, "Next push scheduled at %s", - g_time_val_to_iso8601 (&demux->next_stream)); + g_time_val_to_iso8601 (&demux->next_push)); } else { /* The pipeline is now set up, wait until playback begins */ goto pause_task; @@ -1187,7 +1187,7 @@ gst_dash_demux_pause_stream_task (GstDashDemux * demux) static void gst_dash_demux_resume_stream_task (GstDashDemux * demux) { - g_get_current_time (&demux->next_stream); + g_get_current_time (&demux->next_push); gst_task_start (demux->stream_task); } diff --git a/ext/dash/gstdashdemux.h b/ext/dash/gstdashdemux.h index f4c3a64..e0f5c1c 100644 --- a/ext/dash/gstdashdemux.h +++ b/ext/dash/gstdashdemux.h @@ -81,7 +81,7 @@ struct _GstDashDemux GStaticRecMutex stream_lock; gboolean stop_stream_task; GMutex *stream_timed_lock; - GTimeVal next_stream; /* Time of the next push */ + GTimeVal next_push; /* Time of the next push */ /* Download task */ GstTask *download_task; -- 2.7.4