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

videotimecode: Fix handling of timecodes without daily jam in gst_video_time_code_to_date_time()

Browse source 
So that it behaves according to documentation.
This commit is contained in:
Sebastian Dröge 2018-12-14 20:59:11 +02:00 committed by Mathieu Duponchelle
parent 17cc4beaa1
commit 905dcce61b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,17 +177,13 @@ gst_video_time_code_to_date_time (const GstVideoTimeCode * tc)
gdouble add_us; gdouble add_us;
g_return_val_if_fail (gst_video_time_code_is_valid (tc), NULL); g_return_val_if_fail (gst_video_time_code_is_valid (tc), NULL);
g_return_val_if_fail (tc->config.latest_daily_jam != NULL, NULL);
ret = g_date_time_ref (tc->config.latest_daily_jam); if (tc->config.latest_daily_jam == NULL) {
if (ret == NULL) {
gchar *tc_str = gst_video_time_code_to_string (tc); gchar *tc_str = gst_video_time_code_to_string (tc);
GST_WARNING GST_WARNING
("Asked to convert time code %s to GDateTime, but its latest daily jam is NULL", ("Asked to convert time code %s to GDateTime, but its latest daily jam is NULL",
tc_str); tc_str);
g_free (tc_str); g_free (tc_str);
g_date_time_unref (ret);
return NULL; return NULL;
} }
@ -197,10 +193,11 @@ gst_video_time_code_to_date_time (const GstVideoTimeCode * tc)
("Asked to convert time code %s to GDateTime, but its framerate is unknown", ("Asked to convert time code %s to GDateTime, but its framerate is unknown",
tc_str); tc_str);
g_free (tc_str); g_free (tc_str);
g_date_time_unref (ret);
return NULL; return NULL;
} }
ret = g_date_time_ref (tc->config.latest_daily_jam);
gst_util_fraction_to_double (tc->frames * tc->config.fps_d, tc->config.fps_n, gst_util_fraction_to_double (tc->frames * tc->config.fps_d, tc->config.fps_n,
&add_us); &add_us);
if ((tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_INTERLACED) if ((tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_INTERLACED)