decklink/clock: remove clock_offset
It is completely unused and only ever initialized to 0. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9267>
This commit is contained in:
parent
cae2b38614
commit
f7ad5cb570
@ -2533,13 +2533,11 @@ gst_decklink_clock_get_internal_time (GstClock * clock)
|
||||
{
|
||||
GstDecklinkClock *self = GST_DECKLINK_CLOCK (clock);
|
||||
GstClockTime result, start_time, last_time;
|
||||
GstClockTimeDiff offset;
|
||||
BMDTimeValue time;
|
||||
HRESULT ret;
|
||||
|
||||
g_mutex_lock (&self->output->lock);
|
||||
start_time = self->output->clock_start_time;
|
||||
offset = self->output->clock_offset;
|
||||
last_time = self->output->clock_last_time;
|
||||
time = -1;
|
||||
if (!self->output->started) {
|
||||
@ -2560,13 +2558,6 @@ gst_decklink_clock_get_internal_time (GstClock * clock)
|
||||
else
|
||||
result = 0;
|
||||
|
||||
if (self->output->clock_restart) {
|
||||
self->output->clock_offset = result - last_time;
|
||||
offset = self->output->clock_offset;
|
||||
self->output->clock_restart = FALSE;
|
||||
}
|
||||
result = MAX (last_time, result);
|
||||
result -= offset;
|
||||
result = MAX (last_time, result);
|
||||
} else {
|
||||
result = last_time;
|
||||
@ -2579,9 +2570,8 @@ gst_decklink_clock_get_internal_time (GstClock * clock)
|
||||
|
||||
GST_LOG_OBJECT (clock,
|
||||
"result %" GST_TIME_FORMAT " time %" GST_TIME_FORMAT " last time %"
|
||||
GST_TIME_FORMAT " offset %" GST_TIME_FORMAT " start time %"
|
||||
GST_TIME_FORMAT " (ret: 0x%08lx)", GST_TIME_ARGS (result),
|
||||
GST_TIME_ARGS (time), GST_TIME_ARGS (last_time), GST_TIME_ARGS (offset),
|
||||
GST_TIME_FORMAT " start time %" GST_TIME_FORMAT " (ret: 0x%08lx)",
|
||||
GST_TIME_ARGS (result), GST_TIME_ARGS (time), GST_TIME_ARGS (last_time),
|
||||
GST_TIME_ARGS (start_time), (unsigned long) ret);
|
||||
|
||||
return result;
|
||||
|
@ -552,9 +552,7 @@ struct _GstDecklinkOutput {
|
||||
|
||||
GstClock *clock;
|
||||
GstClockTime clock_start_time, clock_last_time, clock_epoch;
|
||||
GstClockTimeDiff clock_offset;
|
||||
gboolean started;
|
||||
gboolean clock_restart;
|
||||
|
||||
/* Everything below protected by mutex */
|
||||
GMutex lock;
|
||||
|
@ -2191,7 +2191,6 @@ gst_decklink_video_sink_open (GstBaseSink * bsink)
|
||||
self->output->clock_start_time = GST_CLOCK_TIME_NONE;
|
||||
self->output->clock_epoch += self->output->clock_last_time;
|
||||
self->output->clock_last_time = 0;
|
||||
self->output->clock_offset = 0;
|
||||
GST_OBJECT_LOCK (self);
|
||||
self->internal_base_time = GST_CLOCK_TIME_NONE;
|
||||
self->external_base_time = GST_CLOCK_TIME_NONE;
|
||||
@ -2407,7 +2406,6 @@ gst_decklink_video_sink_change_state (GstElement * element,
|
||||
g_mutex_lock (&self->output->lock);
|
||||
self->output->clock_epoch += self->output->clock_last_time;
|
||||
self->output->clock_last_time = 0;
|
||||
self->output->clock_offset = 0;
|
||||
g_mutex_unlock (&self->output->lock);
|
||||
gst_element_post_message (element,
|
||||
gst_message_new_clock_provide (GST_OBJECT_CAST (element),
|
||||
@ -2451,7 +2449,6 @@ gst_decklink_video_sink_change_state (GstElement * element,
|
||||
g_mutex_lock (&self->output->lock);
|
||||
self->output->clock_epoch += self->output->clock_last_time;
|
||||
self->output->clock_last_time = 0;
|
||||
self->output->clock_offset = 0;
|
||||
g_mutex_unlock (&self->output->lock);
|
||||
gst_decklink_video_sink_stop (self);
|
||||
GST_OBJECT_LOCK (self);
|
||||
|
Loading…
x
Reference in New Issue
Block a user