mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "videorate: In reverse playback mode, don't output the first buffer with ts=segment.stop"

Browse source 
This reverts commit e6736e9925.

This one is for after 1.12.0 and shouldn't have been merged yet.
This commit is contained in:
Sebastian Dröge 2017-05-02 14:32:02 +03:00
parent a3656ba29b
commit 0be4504b10
1 changed files with 32 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
gst/videorate/gstvideorate.c
View file

@ -550,8 +550,7 @@ gst_video_rate_setcaps (GstBaseTransform * trans, GstCaps * in_caps,
* out_frame_count */
if (videorate->to_rate_numerator) {
videorate->base_ts +=
gst_util_uint64_scale (videorate->out_frame_count +
(videorate->segment.rate < 0.0 ? 1 : 0),
gst_util_uint64_scale (videorate->out_frame_count,
videorate->to_rate_denominator * GST_SECOND,
videorate->to_rate_numerator);
}
@ -665,13 +664,13 @@ gst_video_rate_flush_prev (GstVideoRate * videorate, gboolean duplicate,
if (videorate->segment.rate < 0.0) {
if (videorate->to_rate_numerator) {
/* interpolate next expected timestamp in the segment */
videorate->next_ts =
videorate->segment.base + videorate->segment.stop -
videorate->base_ts -
gst_util_uint64_scale (videorate->out_frame_count + 1,
gst_util_uint64_scale (videorate->out_frame_count,
videorate->to_rate_denominator * GST_SECOND,
videorate->to_rate_numerator);
GST_BUFFER_DURATION (outbuf) = push_ts - videorate->next_ts;
} else if (next_intime != GST_CLOCK_TIME_NONE) {
videorate->next_ts = next_intime;
@ -1355,36 +1354,18 @@ gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
* timestamp in the segment */
if (videorate->skip_to_first || skip) {
videorate->next_ts = intime;
if (videorate->segment.rate < 0.0) {
if (videorate->segment.rate < 0.0)
videorate->base_ts = videorate->segment.stop - in_ts;
} else {
else
videorate->base_ts = in_ts - videorate->segment.start;
}
videorate->out_frame_count = 0;
} else {
if (videorate->segment.rate < 0.0) {
if (videorate->to_rate_numerator) {
GstClockTime frame_duration = gst_util_uint64_scale (1,
videorate->to_rate_denominator * GST_SECOND,
videorate->to_rate_numerator);
videorate->next_ts =
videorate->segment.stop + videorate->segment.base;
if (videorate->next_ts > frame_duration)
videorate->next_ts =
MAX (videorate->segment.start,
videorate->next_ts - frame_duration);
else
videorate->next_ts = videorate->segment.start;
} else {
/* What else can we do? */
videorate->next_ts = intime;
}
} else {
if (videorate->segment.rate < 0.0)
videorate->next_ts =
videorate->segment.stop + videorate->segment.base;
else
videorate->next_ts =
videorate->segment.start + videorate->segment.base;
}
}
}
@ -1437,74 +1418,37 @@ gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
/* got 2 buffers, see which one is the best */
do {
GstClockTime next_ts;
GstClockTime next_ts = videorate->next_ts * videorate->rate;
/* take absolute values, beware: abs and ABS don't work for gint64 */
if (prevtime > next_ts)
diff1 = prevtime - next_ts;
else
diff1 = next_ts - prevtime;
if (intime > next_ts)
diff2 = intime - next_ts;
else
diff2 = next_ts - intime;
GST_LOG_OBJECT (videorate,
"diff with prev %" GST_TIME_FORMAT " diff with new %"
GST_TIME_FORMAT " outgoing ts %" GST_TIME_FORMAT,
GST_TIME_ARGS (diff1), GST_TIME_ARGS (diff2),
GST_TIME_ARGS (next_ts));
if (videorate->segment.rate < 0.0) {
/* Make sure that we have a duration for this buffer. The previous
* buffer already has a duration given by either exactly this code,
* or the code above for the very first buffer */
g_assert (GST_BUFFER_DURATION_IS_VALID (videorate->prevbuf));
if (!GST_BUFFER_DURATION_IS_VALID (buffer))
GST_BUFFER_DURATION (buffer) =
prevtime > intime ? prevtime - intime : 0;
if (!GST_BUFFER_DURATION_IS_VALID (buffer) && prevtime > intime)
GST_BUFFER_DURATION (buffer) = prevtime - intime;
} else {
/* Make sure that we have a duration for previous buffer */
if (!GST_BUFFER_DURATION_IS_VALID (videorate->prevbuf))
GST_BUFFER_DURATION (videorate->prevbuf) =
intime > prevtime ? intime - prevtime : 0;
}
#ifndef ABSDIFF
#define ABSDIFF(a, b) (((a) > (b)) ? (a) - (b) : (b) - (a))
#endif
/* take absolute diffs */
if (videorate->segment.rate < 0.0) {
GstClockTime next_end_ts;
GstClockTime prev_endtime;
GstClockTime in_endtime;
next_ts = videorate->next_ts;
prev_endtime =
MAX (prevtime + GST_BUFFER_DURATION (videorate->prevbuf),
videorate->segment.stop);
in_endtime =
MAX (intime + GST_BUFFER_DURATION (buffer),
videorate->segment.stop);
if (videorate->to_rate_numerator) {
GstClockTime frame_duration = gst_util_uint64_scale (1,
videorate->to_rate_denominator * GST_SECOND,
videorate->to_rate_numerator);
next_end_ts = MAX (next_ts + frame_duration, videorate->segment.stop);
} else {
next_end_ts =
MAX (next_ts + GST_BUFFER_DURATION (videorate->prevbuf),
videorate->segment.stop);
}
next_ts *= videorate->rate;
next_end_ts *= videorate->rate;
diff1 = ABSDIFF (prev_endtime, next_end_ts);
diff2 = ABSDIFF (in_endtime, next_end_ts);
GST_LOG_OBJECT (videorate,
"diff with prev %" GST_TIME_FORMAT " diff with new %"
GST_TIME_FORMAT " outgoing ts %" GST_TIME_FORMAT,
GST_TIME_ARGS (diff1), GST_TIME_ARGS (diff2),
GST_TIME_ARGS (next_end_ts));
} else {
next_ts = videorate->next_ts * videorate->rate;
diff1 = ABSDIFF (prevtime, next_ts);
diff2 = ABSDIFF (intime, next_ts);
GST_LOG_OBJECT (videorate,
"diff with prev %" GST_TIME_FORMAT " diff with new %"
GST_TIME_FORMAT " outgoing ts %" GST_TIME_FORMAT,
GST_TIME_ARGS (diff1), GST_TIME_ARGS (diff2),
GST_TIME_ARGS (next_ts));
if (!GST_BUFFER_DURATION_IS_VALID (videorate->prevbuf)
&& intime > prevtime)
GST_BUFFER_DURATION (videorate->prevbuf) = intime - prevtime;
}
/* output first one when its the best */