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

decklinkvideosink: Keep track of the time when we went to PLAYING for the external clock too

Browse source 
Otherwise we're adding an offset of the time the pipeline was in PLAYING
already to the running time when converting it to our internal clock.
This commit is contained in:
Sebastian Dröge 2015-01-14 15:54:28 +01:00
parent aed66838f3
commit 7b979703f8
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/decklink/gstdecklinkvideosink.cpp
View file

@ -209,12 +209,12 @@ convert_to_internal_clock (GstDecklinkVideoSink * self,
gst_clock_get_calibration (self->output->clock, &internal, &external, gst_clock_get_calibration (self->output->clock, &internal, &external,
&rate_n, &rate_d); &rate_n, &rate_d);
if (rate_n != rate_d) { if (rate_n != rate_d && self->internal_base_time != GST_CLOCK_TIME_NONE) {
GstClockTime external_timestamp = *timestamp; GstClockTime external_timestamp = *timestamp;
// Convert to the running time corresponding to both clock times // Convert to the running time corresponding to both clock times
internal -= self->internal_base_time; internal -= self->internal_base_time;
external -= gst_element_get_base_time (GST_ELEMENT_CAST (self)); external -= self->external_base_time;
// Get the difference in the external time, note // Get the difference in the external time, note
// that the running time is external time. // that the running time is external time.
@ -568,6 +568,8 @@ gst_decklink_video_sink_change_state (GstElement * element,
(NULL), ("Failed to stop scheduled playback: 0x%08x", res)); (NULL), ("Failed to stop scheduled playback: 0x%08x", res));
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
} }
self->internal_base_time = GST_CLOCK_TIME_NONE;
self->external_base_time = GST_CLOCK_TIME_NONE;
break; break;
} }
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:{ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:{
@ -584,8 +586,16 @@ gst_decklink_video_sink_change_state (GstElement * element,
if (start_time == GST_CLOCK_TIME_NONE) if (start_time == GST_CLOCK_TIME_NONE)
start_time = 0; start_time = 0;
// Current times of internal and external clock when we go to
// playing. We need this to convert the pipeline running time
// to the running time of the hardware
//
// We can't use the normal base time for the external clock
// because we might go to PLAYING later than the pipeline
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->external_base_time =
gst_clock_get_internal_time (GST_ELEMENT_CLOCK (self));
convert_to_internal_clock (self, &start_time, NULL); convert_to_internal_clock (self, &start_time, NULL);

1
sys/decklink/gstdecklinkvideosink.h
View file

@ -55,6 +55,7 @@ struct _GstDecklinkVideoSink
GstVideoInfo info; GstVideoInfo info;
GstClockTime internal_base_time; GstClockTime internal_base_time;
GstClockTime external_base_time;
GstDecklinkOutput *output; GstDecklinkOutput *output;
}; };