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

videorate: Use CLOCK_TIME_IS_VALID instead of checking CLOCK_TIME_NONE

Browse source 
Making it more consistency with the rest of the code.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/668>
This commit is contained in:
Thibault Saunier 2020-05-25 14:48:04 -04:00
parent 086f3c05b9
commit 39c321835b
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/videorate/gstvideorate.c
View file

@ -1362,14 +1362,13 @@ gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
in_ts = GST_BUFFER_TIMESTAMP (buffer); in_ts = GST_BUFFER_TIMESTAMP (buffer);
in_dur = GST_BUFFER_DURATION (buffer); in_dur = GST_BUFFER_DURATION (buffer);
if (G_UNLIKELY (in_ts == GST_CLOCK_TIME_NONE)) { if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (in_ts))) {
/* For reverse playback, we need all input timestamps as we can't /* For reverse playback, we need all input timestamps as we can't
* guess from the previous buffers timestamp and duration */ * guess from the previous buffers timestamp and duration */
if (G_UNLIKELY (in_ts == GST_CLOCK_TIME_NONE if (G_UNLIKELY (videorate->segment.rate < 0.0))
&& videorate->segment.rate < 0.0))
goto invalid_buffer; goto invalid_buffer;
in_ts = videorate->last_ts; in_ts = videorate->last_ts;
if (G_UNLIKELY (in_ts == GST_CLOCK_TIME_NONE)) if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (in_ts)))
goto invalid_buffer; goto invalid_buffer;
} }
@ -1377,7 +1376,7 @@ gst_video_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
* next buffer has -1 as a timestamp */ * next buffer has -1 as a timestamp */
last_ts = videorate->last_ts; last_ts = videorate->last_ts;
videorate->last_ts = in_ts; videorate->last_ts = in_ts;
if (in_dur != GST_CLOCK_TIME_NONE && videorate->segment.rate > 0.0) if (GST_CLOCK_TIME_IS_VALID (in_dur) && videorate->segment.rate > 0.0)
videorate->last_ts += in_dur; videorate->last_ts += in_dur;
GST_DEBUG_OBJECT (videorate, "got buffer with timestamp %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (videorate, "got buffer with timestamp %" GST_TIME_FORMAT,