mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
gstpipeline: Simplify base time checking slightly
Simplify checking and distribution of the base time - don't re-check the value of a local variable that was set 3 lines earlier.
This commit is contained in:
parent
517ab2860e
commit
dc2c4de73a
1 changed files with 3 additions and 6 deletions
|
@ -346,7 +346,6 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
|
||||||
break;
|
break;
|
||||||
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
|
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
|
||||||
{
|
{
|
||||||
GstClockTime new_base_time;
|
|
||||||
GstClockTime now, start_time, last_start_time, delay;
|
GstClockTime now, start_time, last_start_time, delay;
|
||||||
gboolean update_clock;
|
gboolean update_clock;
|
||||||
GstClock *cur_clock;
|
GstClock *cur_clock;
|
||||||
|
@ -407,20 +406,18 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
|
||||||
gst_object_unref (clock);
|
gst_object_unref (clock);
|
||||||
|
|
||||||
if (start_time != GST_CLOCK_TIME_NONE && now != GST_CLOCK_TIME_NONE) {
|
if (start_time != GST_CLOCK_TIME_NONE && now != GST_CLOCK_TIME_NONE) {
|
||||||
new_base_time = now - start_time + delay;
|
GstClockTime new_base_time = now - start_time + delay;
|
||||||
GST_DEBUG_OBJECT (element,
|
GST_DEBUG_OBJECT (element,
|
||||||
"start_time=%" GST_TIME_FORMAT ", now=%" GST_TIME_FORMAT
|
"start_time=%" GST_TIME_FORMAT ", now=%" GST_TIME_FORMAT
|
||||||
", base_time %" GST_TIME_FORMAT,
|
", base_time %" GST_TIME_FORMAT,
|
||||||
GST_TIME_ARGS (start_time), GST_TIME_ARGS (now),
|
GST_TIME_ARGS (start_time), GST_TIME_ARGS (now),
|
||||||
GST_TIME_ARGS (new_base_time));
|
GST_TIME_ARGS (new_base_time));
|
||||||
} else
|
|
||||||
new_base_time = GST_CLOCK_TIME_NONE;
|
|
||||||
|
|
||||||
if (new_base_time != GST_CLOCK_TIME_NONE)
|
|
||||||
gst_element_set_base_time (element, new_base_time);
|
gst_element_set_base_time (element, new_base_time);
|
||||||
else
|
} else {
|
||||||
GST_DEBUG_OBJECT (pipeline,
|
GST_DEBUG_OBJECT (pipeline,
|
||||||
"NOT adjusting base_time because start_time is NONE");
|
"NOT adjusting base_time because start_time is NONE");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
GST_DEBUG_OBJECT (pipeline,
|
GST_DEBUG_OBJECT (pipeline,
|
||||||
"NOT adjusting base_time because we selected one before");
|
"NOT adjusting base_time because we selected one before");
|
||||||
|
|
Loading…
Reference in a new issue