From 4feeea6c13189b9b378e54b5e07abb6ccbdeeac8 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 22 Nov 2005 16:31:41 +0000 Subject: [PATCH] Add underscore. Original commit message from CVS: Add underscore. --- ChangeLog | 6 ++++++ gst/videorate/gstvideorate.c | 2 +- gst/videotestsrc/gstvideotestsrc.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 930efe0..efb3c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ * gst/videorate/gstvideorate.c: (gst_videorate_chain): * gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_create): + Add underscore. + +2005-11-22 Michael Smith + + * gst/videorate/gstvideorate.c: (gst_videorate_chain): + * gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_create): Use utility method for scaling clocktime for fractional framerates. 2005-11-22 Jan Schmidt diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c index 037e476..f785073 100644 --- a/gst/videorate/gstvideorate.c +++ b/gst/videorate/gstvideorate.c @@ -510,7 +510,7 @@ gst_videorate_chain (GstPad * pad, GstBuffer * buffer) if (videorate->to_rate_numerator) { videorate->next_ts = videorate->first_ts + - gst_util_clocktime_scale (videorate->out * GST_SECOND, + gst_util_clock_time_scale (videorate->out * GST_SECOND, videorate->to_rate_denominator, videorate->to_rate_numerator); GST_BUFFER_DURATION (outbuf) = videorate->next_ts - GST_BUFFER_TIMESTAMP (outbuf); diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 1cab0a4..1b49493 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -459,13 +459,13 @@ gst_videotestsrc_create (GstPushSrc * psrc, GstBuffer ** buffer) GST_BUFFER_TIMESTAMP (outbuf) = src->timestamp_offset + src->running_time; if (src->rate_numerator != 0) { - GST_BUFFER_DURATION (outbuf) = gst_utils_clocktime_scale (GST_SECOND, + GST_BUFFER_DURATION (outbuf) = gst_utils_clock_time_scale (GST_SECOND, src->rate_denominator, src->rate_numerator); } src->n_frames++; if (src->rate_numerator != 0) { - src->running_time = gst_utils_clocktime_scale (src->n_frames * GST_SECOND, + src->running_time = gst_utils_clock_time_scale (src->n_frames * GST_SECOND, src->rate_denominator, src->rate_numerator); } -- 2.7.4