ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove preconditions requiring correct formatting of input times in time lib.

Browse source 
For example, one could not specify minutes > 59 nor milliseconds > 999.  Other
parts of the code however relied on the fact that one could give arbitrary times
in all fields (hours, milliseconds and minutes).
This commit is contained in:
Stefan Kangas 2010-12-14 14:22:33 +01:00 committed by Ichthyostega
parent 6a44134833
commit 551ec8f011
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib/time.c
View file

@ -61,10 +61,6 @@ lumiera_tmpbuf_print_time (gavl_time_t time)
gavl_time_t
lumiera_build_time (long millis, uint secs, uint mins, uint hours)
{
REQUIRE (millis >= 0 && millis <= 999);
REQUIRE (mins < 60);
REQUIRE (secs < 60);
gavl_time_t time = millis
+ 1000 * secs
+ 1000 * 60 * mins
@ -76,10 +72,6 @@ lumiera_build_time (long millis, uint secs, uint mins, uint hours)
gavl_time_t
lumiera_build_time_fps (float fps, uint frames, uint secs, uint mins, uint hours)
{
REQUIRE (mins < 60);
REQUIRE (secs < 60);
REQUIRE (frames < fps);
gavl_time_t time = frames * (1000.0 / fps)
+ 1000 * secs
+ 1000 * 60 * mins
@ -91,11 +83,6 @@ lumiera_build_time_fps (float fps, uint frames, uint secs, uint mins, uint hours
gavl_time_t
lumiera_build_time_ntsc_drop (uint frames, uint secs, uint mins, uint hours)
{
REQUIRE (mins < 60);
REQUIRE (secs < 60);
REQUIRE (frames < 30);
REQUIRE_IF (secs == 0 && mins % 10, frames >= 2, "non-existent frame in NTSC drop-frame");
int total_mins = 60 * hours + mins;
int total_frames = 108000 * hours
+ 1800 * mins