mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

videotimecode: Fix invalid timecode right before a new second

Browse source 
When initializing a timecode from a GDateTime, and the remaining time
until the new second is less than half a frame (according to the given
frame rate), it would lead to the creation of an invalid timecode, e.g.
00:00:00:25 (at 25 fps) instead of 00:00:01:00. Fixed.

https://bugzilla.gnome.org/show_bug.cgi?id=779866
This commit is contained in:
Vivia Nikolaidou 2017-03-10 17:40:13 +02:00 committed by Sebastian Dröge
parent d15b0f4844
commit a122135194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/video/gstvideotimecode.c
View file

@ -219,6 +219,7 @@ gst_video_time_code_init_from_date_time (GstVideoTimeCode * tc,
{ {
GDateTime *jam; GDateTime *jam;
guint64 frames; guint64 frames;
gboolean add_a_frame = FALSE;
jam = g_date_time_new_local (g_date_time_get_year (dt), jam = g_date_time_new_local (g_date_time_get_year (dt),
g_date_time_get_month (dt), g_date_time_get_day_of_month (dt), 0, 0, 0.0); g_date_time_get_month (dt), g_date_time_get_day_of_month (dt), 0, 0, 0.0);
@ -228,6 +229,11 @@ gst_video_time_code_init_from_date_time (GstVideoTimeCode * tc,
frames = frames =
gst_util_uint64_scale_round (g_date_time_get_microsecond (dt) * gst_util_uint64_scale_round (g_date_time_get_microsecond (dt) *
G_GINT64_CONSTANT (1000), fps_n, fps_d * GST_SECOND); G_GINT64_CONSTANT (1000), fps_n, fps_d * GST_SECOND);
if (G_UNLIKELY (frames == fps_n)) {
/* Avoid invalid timecodes */
frames--;
add_a_frame = TRUE;
}
gst_video_time_code_init (tc, fps_n, fps_d, jam, flags, gst_video_time_code_init (tc, fps_n, fps_d, jam, flags,
g_date_time_get_hour (dt), g_date_time_get_minute (dt), g_date_time_get_hour (dt), g_date_time_get_minute (dt),
@ -240,6 +246,8 @@ gst_video_time_code_init_from_date_time (GstVideoTimeCode * tc,
tc->frames = df; tc->frames = df;
} }
} }
if (add_a_frame)
gst_video_time_code_increment_frame (tc);
g_date_time_unref (jam); g_date_time_unref (jam);