diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-30 08:36:18 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-30 08:36:18 +0200 |
| commit | f1995f11fc5659ae6e267ba3969a83d58df9a31f (patch) | |
| tree | c35900b787f90af44a71ebb2b77577d9c1ebeb10 /gst/videomixer/videomixer2.c | |
| parent | 5f0bab00cdb35b85ff8dfd099c23d4f368a71abd (diff) | |
Imported Upstream version 1.1.3
Diffstat (limited to 'gst/videomixer/videomixer2.c')
| -rw-r--r-- | gst/videomixer/videomixer2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 464dc48c..63f4204f 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -590,7 +590,7 @@ gst_videomixer2_update_qos (GstVideoMixer2 * mix, gdouble proportion, if (G_LIKELY (timestamp != GST_CLOCK_TIME_NONE)) { if (G_UNLIKELY (diff > 0)) mix->earliest_time = - timestamp + 2 * diff + gst_util_uint64_scale_int (GST_SECOND, + timestamp + 2 * diff + gst_util_uint64_scale_int_round (GST_SECOND, GST_VIDEO_INFO_FPS_D (&mix->info), GST_VIDEO_INFO_FPS_N (&mix->info)); else mix->earliest_time = timestamp + diff; @@ -1013,7 +1013,7 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix) } output_end_time = - mix->ts_offset + gst_util_uint64_scale (mix->nframes + 1, + mix->ts_offset + gst_util_uint64_scale_round (mix->nframes + 1, GST_SECOND * GST_VIDEO_INFO_FPS_D (&mix->info), GST_VIDEO_INFO_FPS_N (&mix->info)) + mix->segment.start; if (mix->segment.stop != -1) @@ -1664,7 +1664,7 @@ gst_videomixer2_sink_clip (GstCollectPads * pads, end_time = GST_BUFFER_DURATION (buf); if (end_time == -1 && GST_VIDEO_INFO_FPS_N (&pad->info) != 0) end_time = - gst_util_uint64_scale_int (GST_SECOND, + gst_util_uint64_scale_int_round (GST_SECOND, GST_VIDEO_INFO_FPS_D (&pad->info), GST_VIDEO_INFO_FPS_N (&pad->info)); if (end_time == -1) { *outbuf = buf; |