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

rtpmanager: use GST_STIME_ARGS for GstClockTimeDiff

Browse source 
No need to manually handle negative values of diff, GST_STIME_ARGS does
exactly this.
This commit is contained in:
Luis de Bethencourt 2015-11-03 14:26:29 +00:00
parent ae729440b1
commit d4f094f587
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/rtpmanager/rtpsource.c
View file

@ -1484,17 +1484,15 @@ rtp_source_get_new_sr (RTPSource * src, guint64 ntpnstime,
* We need to apply this diff to the RTP timestamp to get the RTP timestamp * We need to apply this diff to the RTP timestamp to get the RTP timestamp
* for the given ntpnstime. */ * for the given ntpnstime. */
diff = GST_CLOCK_DIFF (src->last_rtime, running_time); diff = GST_CLOCK_DIFF (src->last_rtime, running_time);
GST_DEBUG ("running_time %" GST_TIME_FORMAT ", diff %" GST_STIME_FORMAT,
GST_TIME_ARGS (running_time), GST_STIME_ARGS (diff));
/* now translate the diff to RTP time, handle positive and negative cases. /* now translate the diff to RTP time, handle positive and negative cases.
* If there is no diff, we already set rtptime correctly above. */ * If there is no diff, we already set rtptime correctly above. */
if (diff > 0) { if (diff > 0) {
GST_DEBUG ("running_time %" GST_TIME_FORMAT ", diff %" GST_TIME_FORMAT,
GST_TIME_ARGS (running_time), GST_TIME_ARGS (diff));
t_rtp += gst_util_uint64_scale_int (diff, src->clock_rate, GST_SECOND); t_rtp += gst_util_uint64_scale_int (diff, src->clock_rate, GST_SECOND);
} else { } else {
diff = -diff; diff = -diff;
GST_DEBUG ("running_time %" GST_TIME_FORMAT ", diff -%" GST_TIME_FORMAT,
GST_TIME_ARGS (running_time), GST_TIME_ARGS (diff));
t_rtp -= gst_util_uint64_scale_int (diff, src->clock_rate, GST_SECOND); t_rtp -= gst_util_uint64_scale_int (diff, src->clock_rate, GST_SECOND);
} }
} else { } else {