diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-02 00:28:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-02 00:28:06 +0000 |
| commit | 6d7dc1a2b650a74f23b772d215bb43d5f7b3e173 (patch) | |
| tree | 1fa8e129e9c2728888829e6cff79b5aac6edd726 | |
| parent | 7ed77ae6d938d5ce9b436736fec1029e2f9984d1 (diff) | |
Fix tests. Fix rounding of time creation from seconds of frame counts.
| -rw-r--r-- | src/dcp_time.cc | 2 | ||||
| -rw-r--r-- | test/dcp_time_test.cc | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc index 4c16a91a..9b93391b 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -56,8 +56,8 @@ Time::Time (int64_t ticks) void Time::set (double ss) { - t = (int (round (ss * 1000)) % 1000) / 4; s = floor (ss); + t = int (round (1000 * (ss - s) / 4)); if (s >= 60) { m = s / 60; diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 525f281b..52ff43c6 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -72,9 +72,16 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (a.s, 0); BOOST_CHECK_EQUAL (a.t, 0); - a = libdcp::Time (3425, 24); + /* Check rounding; 3424 is 142.666666666... seconds or 0.166666666... ticks */ + a = libdcp::Time (3424, 24); BOOST_CHECK_EQUAL (a.h, 0); BOOST_CHECK_EQUAL (a.m, 2); + BOOST_CHECK_EQUAL (a.s, 22); + BOOST_CHECK_EQUAL (a.t, 167); + + a = libdcp::Time (3425, 24); + BOOST_CHECK_EQUAL (a.h, 0); BOOST_CHECK_EQUAL (a.m, 2); + BOOST_CHECK_EQUAL (a.s, 22); BOOST_CHECK_EQUAL (a.t, 177); } |