From f548bb923261054d7680b7e701fb434e12a7fb0e Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 16 Apr 2020 12:53:00 -0400 Subject: [PATCH] timeline: Fix wrong usage of scale_int We are multiplying the framerate by GST_SECOND and thus have no guarantee that it won't overflow. --- ges/ges-clip-asset.c | 3 +-- ges/ges-timeline.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ges/ges-clip-asset.c b/ges/ges-clip-asset.c index deb279e..e85e67e 100644 --- a/ges/ges-clip-asset.c +++ b/ges/ges-clip-asset.c @@ -230,6 +230,5 @@ ges_clip_asset_get_frame_time (GESClipAsset * self, GESFrameNumber frame_number) if (!ges_clip_asset_get_natural_framerate (self, &fps_n, &fps_d)) return GST_CLOCK_TIME_NONE; - return gst_util_uint64_scale_int_ceil (frame_number, fps_d * GST_SECOND, - fps_n); + return gst_util_uint64_scale_ceil (frame_number, fps_d * GST_SECOND, fps_n); } diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index d8dd8e5..4963fef 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -3109,8 +3109,7 @@ ges_timeline_get_frame_time (GESTimeline * self, GESFrameNumber frame_number) timeline_get_framerate (self, &fps_n, &fps_d); - return gst_util_uint64_scale_int_ceil (frame_number, - fps_d * GST_SECOND, fps_n); + return gst_util_uint64_scale_ceil (frame_number, fps_d * GST_SECOND, fps_n); } /** -- 2.7.4