mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklink: fix timestamp tracking when pausing

Browse source 
play->pause->sleep()->play would result in late frames being scheduled
This commit is contained in:
Matthew Waters 2019-10-14 02:22:18 -05:00
parent 0cc7d6f093
commit 4d528776b6
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/decklink/gstdecklinkvideosink.cpp
View file

@ -793,7 +793,7 @@ gst_decklink_video_sink_convert_to_internal_clock (GstDecklinkVideoSink * self,
else else
*timestamp = gst_clock_get_internal_time (self->output->clock); *timestamp = gst_clock_get_internal_time (self->output->clock);
GST_LOG_OBJECT (self, "Output timestamp %" GST_TIME_FORMAT GST_DEBUG_OBJECT (self, "Output timestamp %" GST_TIME_FORMAT
" using clock epoch %" GST_TIME_FORMAT, " using clock epoch %" GST_TIME_FORMAT,
GST_TIME_ARGS (*timestamp), GST_TIME_ARGS (self->output->clock_epoch)); GST_TIME_ARGS (*timestamp), GST_TIME_ARGS (self->output->clock_epoch));
@ -1200,7 +1200,7 @@ gst_decklink_video_sink_prepare (GstBaseSink * bsink, GstBuffer * buffer)
gint stride; gint stride;
GstVideoTimeCodeMeta *tc_meta; GstVideoTimeCodeMeta *tc_meta;
GST_DEBUG_OBJECT (self, "Preparing buffer %p", buffer); GST_DEBUG_OBJECT (self, "Preparing buffer %" GST_PTR_FORMAT, buffer);
// FIXME: Handle no timestamps // FIXME: Handle no timestamps
if (!GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) { if (!GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) {
@ -1498,7 +1498,7 @@ gst_decklink_video_sink_start_scheduled_playback (GstElement * element)
_wait_for_stop_notify (self); _wait_for_stop_notify (self);
} }
GST_DEBUG_OBJECT (self, GST_INFO_OBJECT (self,
"Starting scheduled playback at %" GST_TIME_FORMAT, "Starting scheduled playback at %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time)); GST_TIME_ARGS (start_time));
@ -1527,7 +1527,7 @@ gst_decklink_video_sink_stop_scheduled_playback (GstDecklinkVideoSink * self)
start_time = gst_clock_get_internal_time (self->output->clock); start_time = gst_clock_get_internal_time (self->output->clock);
GST_DEBUG_OBJECT (self, GST_INFO_OBJECT (self,
"Stopping scheduled playback at %" GST_TIME_FORMAT, "Stopping scheduled playback at %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time)); GST_TIME_ARGS (start_time));
@ -1599,6 +1599,9 @@ gst_decklink_video_sink_change_state (GstElement * element,
self->internal_base_time = self->internal_base_time =
gst_clock_get_internal_time (self->output->clock); gst_clock_get_internal_time (self->output->clock);
self->internal_time_offset = self->internal_base_time; self->internal_time_offset = self->internal_base_time;
} else if (GST_CLOCK_TIME_IS_VALID (self->internal_pause_time)) {
self->internal_time_offset +=
gst_clock_get_internal_time (self->output->clock) - self->internal_pause_time;
} }
GST_INFO_OBJECT (self, "clock has been set to %" GST_PTR_FORMAT GST_INFO_OBJECT (self, "clock has been set to %" GST_PTR_FORMAT
@ -1652,6 +1655,7 @@ gst_decklink_video_sink_change_state (GstElement * element,
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
self->internal_base_time = GST_CLOCK_TIME_NONE; self->internal_base_time = GST_CLOCK_TIME_NONE;
self->external_base_time = GST_CLOCK_TIME_NONE; self->external_base_time = GST_CLOCK_TIME_NONE;
self->internal_pause_time = GST_CLOCK_TIME_NONE;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
break; break;
} }
@ -1661,6 +1665,7 @@ gst_decklink_video_sink_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
self->internal_pause_time = gst_clock_get_internal_time (self->output->clock);
break; break;
default: default:
break; break;

1
sys/decklink/gstdecklinkvideosink.h
View file

@ -64,6 +64,7 @@ struct _GstDecklinkVideoSink
/* really an internal start time */ /* really an internal start time */
GstClockTime internal_time_offset; GstClockTime internal_time_offset;
GstClockTime internal_pause_time;
GstDecklinkOutput *output; GstDecklinkOutput *output;