mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

videotimecode: Remove various unneeded checks

Browse source
This commit is contained in:
Sebastian Dröge 2018-12-14 21:00:03 +02:00 committed by Mathieu Duponchelle
parent 905dcce61b
commit 6aa8936eee
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,7 @@ gst_video_time_code_nsec_since_daily_jam (const GstVideoTimeCode * tc)
g_return_val_if_fail (gst_video_time_code_is_valid (tc), -1); g_return_val_if_fail (gst_video_time_code_is_valid (tc), -1);
if (tc->config.fps_n == 0 && tc->config.fps_d == 1) { if (tc->config.fps_n == 0) {
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 calculate nsec since daily jam of time code %s, but its framerate is unknown", ("Asked to calculate nsec since daily jam of time code %s, but its framerate is unknown",
@ -382,9 +382,8 @@ gst_video_time_code_frames_since_daily_jam (const GstVideoTimeCode * tc)
} else if (tc->config.fps_n == 60000) { } else if (tc->config.fps_n == 60000) {
dropframe_multiplier = 4; dropframe_multiplier = 4;
} else { } else {
GST_ERROR ("Unsupported drop frame rate %u/%u", tc->config.fps_n, /* already checked by gst_video_time_code_is_valid() */
tc->config.fps_d); g_assert_not_reached ();
return -1;
} }
return tc->frames + (ff_nom * tc->seconds) + return tc->frames + (ff_nom * tc->seconds) +
@ -443,10 +442,8 @@ gst_video_time_code_add_frames (GstVideoTimeCode * tc, gint64 frames)
ff_nom = tc->config.fps_n / 1000; ff_nom = tc->config.fps_n / 1000;
} else { } else {
ff_nom = ff; ff_nom = ff;
if (tc->config.fps_d != 1)
GST_WARNING ("Unsupported frame rate %u/%u, results may be wrong",
tc->config.fps_n, tc->config.fps_d);
} }
if (tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME) { if (tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME) {
/* these need to be truncated to integer: side effect, code looks cleaner /* these need to be truncated to integer: side effect, code looks cleaner
* */ * */
@ -459,14 +456,13 @@ gst_video_time_code_add_frames (GstVideoTimeCode * tc, gint64 frames)
* drop the first 4 : so we use this number */ * drop the first 4 : so we use this number */
guint dropframe_multiplier; guint dropframe_multiplier;
if (tc->config.fps_n == 30000) if (tc->config.fps_n == 30000) {
dropframe_multiplier = 2; dropframe_multiplier = 2;
else if (tc->config.fps_n == 60000) } else if (tc->config.fps_n == 60000) {
dropframe_multiplier = 4; dropframe_multiplier = 4;
else { } else {
GST_ERROR ("Unsupported drop frame rate %u/%u", tc->config.fps_n, /* already checked by gst_video_time_code_is_valid() */
tc->config.fps_d); g_assert_not_reached ();
return;
} }
framecount = framecount =
@ -514,11 +510,14 @@ gst_video_time_code_add_frames (GstVideoTimeCode * tc, gint64 frames)
if (frames_new > ff_nom) if (frames_new > ff_nom)
frames_new = 0; frames_new = 0;
} }
h_new = h_notmod24 % 24; h_new = h_notmod24 % 24;
/* The calculations above should always give correct results */
g_assert (min_new < 60); g_assert (min_new < 60);
g_assert (sec_new < 60); g_assert (sec_new < 60);
g_assert (frames_new < ff_nom); g_assert (frames_new < ff_nom);
tc->hours = h_new; tc->hours = h_new;
tc->minutes = min_new; tc->minutes = min_new;
tc->seconds = sec_new; tc->seconds = sec_new;