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

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

Browse source 
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
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
subprojects/gst-plugins-base/gst/videorate/gstvideorate.c
View file

@ -961,40 +961,49 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
if (segment.format != GST_FORMAT_TIME) if (segment.format != GST_FORMAT_TIME)
goto format_error; goto format_error;
rolled_back_caps = segment.start = (gint64) (segment.start / videorate->rate);
gst_video_rate_rollback_to_prev_caps_if_needed (videorate); 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);
/* close up the previous segment, if appropriate */
if (videorate->prevbuf) { if (!gst_segment_is_equal (&segment, &videorate->segment)) {
/* fill up to the end of current segment */ rolled_back_caps =
gint count = gst_video_rate_duplicate_to_close_segment (videorate); gst_video_rate_rollback_to_prev_caps_if_needed (videorate);
if (count > 1) {
videorate->dup += count - 1; /* close up the previous segment, if appropriate */
if (!videorate->silent) if (videorate->prevbuf) {
gst_video_rate_notify_duplicate (videorate); /* fill up to the end of current segment */
gint count = gst_video_rate_duplicate_to_close_segment (videorate);
if (count > 1) {
videorate->dup += count - 1;
if (!videorate->silent)
gst_video_rate_notify_duplicate (videorate);
}
/* clean up for the new one; _chain will resume from the new start */
gst_video_rate_swap_prev (videorate, NULL, 0);
} }
/* clean up for the new one; _chain will resume from the new start */
gst_video_rate_swap_prev (videorate, NULL, 0);
}
if (rolled_back_caps) { if (rolled_back_caps) {
GST_DEBUG_OBJECT (videorate, GST_DEBUG_OBJECT (videorate,
"Resetting rolled back caps %" GST_PTR_FORMAT, rolled_back_caps); "Resetting rolled back caps %" GST_PTR_FORMAT, rolled_back_caps);
if (!gst_pad_send_event (GST_BASE_TRANSFORM_SINK_PAD (videorate), if (!gst_pad_send_event (GST_BASE_TRANSFORM_SINK_PAD (videorate),
gst_event_new_caps (rolled_back_caps) gst_event_new_caps (rolled_back_caps)
)) { )) {
GST_WARNING_OBJECT (videorate, "Could not resend caps after closing " GST_WARNING_OBJECT (videorate,
" segment"); "Could not resend caps after closing " " segment");
GST_ELEMENT_ERROR (videorate, CORE, NEGOTIATION,
("Could not resend caps after closing segment"), (NULL));
gst_caps_unref (rolled_back_caps);
return FALSE;
}
GST_ELEMENT_ERROR (videorate, CORE, NEGOTIATION,
("Could not resend caps after closing segment"), (NULL));
gst_caps_unref (rolled_back_caps); gst_caps_unref (rolled_back_caps);
return FALSE;
} }
gst_caps_unref (rolled_back_caps);
} }
videorate->base_ts = 0; videorate->base_ts = 0;
@ -1003,12 +1012,6 @@ gst_video_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
/* We just want to update the accumulated stream_time */ /* 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_segment_copy_into (&segment, &videorate->segment);
GST_DEBUG_OBJECT (videorate, "updated segment: %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (videorate, "updated segment: %" GST_SEGMENT_FORMAT,
&videorate->segment); &videorate->segment);