mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

Renamed demux->next_stream in demux->next_push

Browse source
This commit is contained in:
David Corvoysier 2012-10-16 11:26:03 +02:00 committed by Thiago Santos
parent 943f4fa152
commit 089daeba1b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/dash/gstdashdemux.c
View file

@ -930,7 +930,7 @@ gst_dash_demux_stream_loop (GstDashDemux * demux)
/* Wait until the next scheduled push downstream */ /* Wait until the next scheduled push downstream */
if (g_cond_timed_wait (GST_TASK_GET_COND (demux->stream_task), 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; goto pause_task;
} }
@ -985,12 +985,12 @@ gst_dash_demux_stream_loop (GstDashDemux * demux)
} }
if (GST_STATE (demux) == GST_STATE_PLAYING) { if (GST_STATE (demux) == GST_STATE_PLAYING) {
/* Wait for the duration of a fragment before resuming this task */ /* Wait for the duration of a fragment before resuming this task */
g_get_current_time (&demux->next_stream); g_get_current_time (&demux->next_push);
g_time_val_add (&demux->next_stream, g_time_val_add (&demux->next_push,
gst_mpd_client_get_target_duration (demux->client) gst_mpd_client_get_target_duration (demux->client)
/ GST_SECOND * G_USEC_PER_SEC); / GST_SECOND * G_USEC_PER_SEC);
GST_DEBUG_OBJECT (demux, "Next push scheduled at %s", 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 { } else {
/* The pipeline is now set up, wait until playback begins */ /* The pipeline is now set up, wait until playback begins */
goto pause_task; goto pause_task;
@ -1187,7 +1187,7 @@ gst_dash_demux_pause_stream_task (GstDashDemux * demux)
static void static void
gst_dash_demux_resume_stream_task (GstDashDemux * demux) 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); gst_task_start (demux->stream_task);
} }

2
ext/dash/gstdashdemux.h
View file

@ -81,7 +81,7 @@ struct _GstDashDemux
GStaticRecMutex stream_lock; GStaticRecMutex stream_lock;
gboolean stop_stream_task; gboolean stop_stream_task;
GMutex *stream_timed_lock; GMutex *stream_timed_lock;
GTimeVal next_stream; /* Time of the next push */ GTimeVal next_push; /* Time of the next push */
/* Download task */ /* Download task */
GstTask *download_task; GstTask *download_task;