videorate: Do not close segment when getting a same segment twice

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3059>
This commit is contained in:
Thibault Saunier 2022-10-07 11:46:29 -03:00
parent 11b83fb2fc
commit e99393520e

View File

@ -961,6 +961,14 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
if (segment.format != GST_FORMAT_TIME)
goto format_error;
segment.start = (gint64) (segment.start / videorate->rate);
segment.position = (gint64) (segment.position / videorate->rate);
if (GST_CLOCK_TIME_IS_VALID (segment.stop))
segment.stop = (gint64) (segment.stop / videorate->rate);
segment.time = (gint64) (segment.time / videorate->rate);
if (!gst_segment_is_equal (&segment, &videorate->segment)) {
rolled_back_caps =
gst_video_rate_rollback_to_prev_caps_if_needed (videorate);
@ -984,8 +992,8 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
gst_event_new_caps (rolled_back_caps)
)) {
GST_WARNING_OBJECT (videorate, "Could not resend caps after closing "
" segment");
GST_WARNING_OBJECT (videorate,
"Could not resend caps after closing " " segment");
GST_ELEMENT_ERROR (videorate, CORE, NEGOTIATION,
("Could not resend caps after closing segment"), (NULL));
@ -996,6 +1004,7 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
gst_caps_unref (rolled_back_caps);
}
}
videorate->base_ts = 0;
videorate->out_frame_count = 0;
@ -1003,12 +1012,6 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
/* We just want to update the accumulated stream_time */
segment.start = (gint64) (segment.start / videorate->rate);
segment.position = (gint64) (segment.position / videorate->rate);
if (GST_CLOCK_TIME_IS_VALID (segment.stop))
segment.stop = (gint64) (segment.stop / videorate->rate);
segment.time = (gint64) (segment.time / videorate->rate);
gst_segment_copy_into (&segment, &videorate->segment);
GST_DEBUG_OBJECT (videorate, "updated segment: %" GST_SEGMENT_FORMAT,
&videorate->segment);