mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

videorate: Factor out a method for themax-duplication-time property

Browse source 
Sensibly simplifying gst_video_rate_transform_ip

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/668>
This commit is contained in:
Thibault Saunier 2020-05-25 16:29:15 -04:00
parent 39c321835b
commit 6e82eb28f3
1 changed files with 59 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
gst/videorate/gstvideorate.c
View file

@ -1334,6 +1334,62 @@ gst_video_rate_switch_mode_if_needed (GstVideoRate * videorate)
return skip; return skip;
} }
static gboolean
gst_video_rate_do_max_duplicate (GstVideoRate * videorate, GstBuffer * buffer,
GstClockTime intime, GstClockTime prevtime, gint * count)
{
if (videorate->max_duplication_time <= 0)
return TRUE;
/* We already know that intime and prevtime are not out of order, based
* on the previous condition. Using ABS in case rate < 0, in which case
* the order is reversed. */
if (ABS (GST_CLOCK_DIFF (intime, prevtime)) > videorate->max_duplication_time) {
GST_DEBUG_OBJECT (videorate,
"The new buffer (%" GST_TIME_FORMAT
") is further away from previous buffer (%" GST_TIME_FORMAT
") than max-duplication-time (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (intime), GST_TIME_ARGS (prevtime),
GST_TIME_ARGS (videorate->max_duplication_time));
/* First send out enough buffers to actually reach the time of the
* previous buffer */
if (videorate->segment.rate < 0.0) {
while (videorate->next_ts > prevtime) {
gst_video_rate_flush_prev (videorate, *count > 0, GST_CLOCK_TIME_NONE);
*count += 1;
}
} else {
while (videorate->next_ts <= prevtime) {
gst_video_rate_flush_prev (videorate, *count > 0, GST_CLOCK_TIME_NONE);
*count += 1;
}
}
if (*count > 1) {
videorate->dup += *count - 1;
if (!videorate->silent)
gst_video_rate_notify_duplicate (videorate);
}
/* The gap between the two buffers is too large. Don't fill it, just
* let a discont through */
videorate->discont = TRUE;
if (videorate->segment.rate < 0.0) {
videorate->base_ts -= prevtime - intime;
} else {
videorate->base_ts += intime - prevtime;
}
videorate->next_ts = intime;
/* Swap in new buffer and get rid of old buffer so that starting with
* the next input buffer we output from the new position */
gst_video_rate_swap_prev (videorate, buffer, intime);
return FALSE;
}
return TRUE;
}
static GstFlowReturn static GstFlowReturn
gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer) gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
{ {
@ -1489,56 +1545,9 @@ gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
goto done; goto done;
} }
if (videorate->max_duplication_time > 0) { if (!gst_video_rate_do_max_duplicate (videorate, buffer, intime, prevtime,
/* We already know that intime and prevtime are not out of order, based &count))
* on the previous condition. Using ABS in case rate < 0, in which case goto done;
* the order is reversed. */
if (ABS (GST_CLOCK_DIFF (intime,
prevtime)) > videorate->max_duplication_time) {
GST_DEBUG_OBJECT (videorate,
"The new buffer (%" GST_TIME_FORMAT
") is further away from previous buffer (%"
GST_TIME_FORMAT ") than max-duplication-time (%" GST_TIME_FORMAT
")", GST_TIME_ARGS (intime), GST_TIME_ARGS (prevtime),
GST_TIME_ARGS (videorate->max_duplication_time));
/* First send out enough buffers to actually reach the time of the
* previous buffer */
if (videorate->segment.rate < 0.0) {
while (videorate->next_ts > prevtime) {
gst_video_rate_flush_prev (videorate, count > 0,
GST_CLOCK_TIME_NONE);
count += 1;
}
} else {
while (videorate->next_ts <= prevtime) {
gst_video_rate_flush_prev (videorate, count > 0,
GST_CLOCK_TIME_NONE);
count += 1;
}
}
if (count > 1) {
videorate->dup += count - 1;
if (!videorate->silent)
gst_video_rate_notify_duplicate (videorate);
}
/* The gap between the two buffers is too large. Don't fill it, just
* let a discont through */
videorate->discont = TRUE;
if (videorate->segment.rate < 0.0) {
videorate->base_ts -= prevtime - intime;
} else {
videorate->base_ts += intime - prevtime;
}
videorate->next_ts = intime;
/* Swap in new buffer and get rid of old buffer so that starting with
* the next input buffer we output from the new position */
gst_video_rate_swap_prev (videorate, buffer, intime);
goto done;
}
}
/* got 2 buffers, see which one is the best */ /* got 2 buffers, see which one is the best */
do { do {