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 division by zero in timecode validation function

Browse source 
And add some comments about what exactly we're testing in the
non-trivial cases.
This commit is contained in:
Sebastian Dröge 2018-12-14 13:56:28 +02:00 committed by Mathieu Duponchelle
parent fbcbbd363b
commit ef63c44f41
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,8 @@ gst_video_time_code_is_valid (const GstVideoTimeCode * tc)
g_return_val_if_fail (tc != NULL, FALSE); g_return_val_if_fail (tc != NULL, FALSE);
fr = (tc->config.fps_n + (tc->config.fps_d >> 1)) / tc->config.fps_d; if (tc->config.fps_d == 0)
return FALSE;
if (tc->hours >= 24) if (tc->hours >= 24)
return FALSE; return FALSE;
@ -77,10 +78,14 @@ gst_video_time_code_is_valid (const GstVideoTimeCode * tc)
return FALSE; return FALSE;
if (tc->seconds >= 60) if (tc->seconds >= 60)
return FALSE; return FALSE;
if (tc->config.fps_d == 0)
return FALSE; /* We can't have more frames than rounded up frames per second */
fr = (tc->config.fps_n + (tc->config.fps_d >> 1)) / tc->config.fps_d;
if (tc->frames >= fr && (tc->config.fps_n != 0 || tc->config.fps_d != 1)) if (tc->frames >= fr && (tc->config.fps_n != 0 || tc->config.fps_d != 1))
return FALSE; return FALSE;
/* We either need a specific X/1001 framerate or otherwise an integer
* framerate */
if (tc->config.fps_d == 1001) { if (tc->config.fps_d == 1001) {
if (tc->config.fps_n != 30000 && tc->config.fps_n != 60000 && if (tc->config.fps_n != 30000 && tc->config.fps_n != 60000 &&
tc->config.fps_n != 24000) tc->config.fps_n != 24000)
@ -88,6 +93,10 @@ gst_video_time_code_is_valid (const GstVideoTimeCode * tc)
} else if (tc->config.fps_n % tc->config.fps_d != 0) { } else if (tc->config.fps_n % tc->config.fps_d != 0) {
return FALSE; return FALSE;
} }
/* Drop-frame framerates require skipping over the first two
* timecodes every minutes except for every tenth minute in case
* of 30000/1001 and the first four timecodes for 60000/1001 */
if ((tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME) && if ((tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME) &&
tc->minutes % 10 && tc->seconds == 0 && tc->frames < fr / 15) { tc->minutes % 10 && tc->seconds == 0 && tc->frames < fr / 15) {
return FALSE; return FALSE;