Fix handling of timing in SMPTE subtitles.

1 files changed, 39 insertions, 23 deletions

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 9f0072ab..c987517e 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,53 +23,69 @@
 /** Check that dcp::Time works */
 BOOST_AUTO_TEST_CASE (dcp_time)
 {
-	dcp::Time t (977143, 24);
+	/* tcr of 250 makes the editable event length the same as an Interop `tick' */
+	dcp::Time t (977143, 24, 250);
 
-	BOOST_CHECK_EQUAL (t.t, 73);
+	BOOST_CHECK_EQUAL (t.e, 73);
 	BOOST_CHECK_EQUAL (t.s, 34);
 	BOOST_CHECK_EQUAL (t.m, 18);
 	BOOST_CHECK_EQUAL (t.h, 11);
 	BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73");
-	BOOST_CHECK_EQUAL (t.to_ticks(), 10178573);
 
-	dcp::Time a (3, 2, 3, 4);
-	dcp::Time b (2, 3, 4, 5);
+	/* Use a tcr of 24 so that the editable event is a frame */
+	dcp::Time a (3, 2, 3, 4, 24);
+	dcp::Time b (2, 3, 4, 5, 24);
 
 	dcp::Time r = a - b;
 	BOOST_CHECK_EQUAL (r.h, 0);
 	BOOST_CHECK_EQUAL (r.m, 58);
 	BOOST_CHECK_EQUAL (r.s, 58);
-	BOOST_CHECK_EQUAL (r.t, 249);
-	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:249");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 884749);
+	BOOST_CHECK_EQUAL (r.e, 23);
+	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:23");
 
-	a = dcp::Time (1, 58, 56, 240);
-	b = dcp::Time (1, 7, 12, 120);
+	/* Different tcr (25) */
+	a = dcp::Time (1, 58, 56, 2, 25);
+	b = dcp::Time (1, 7, 12, 1, 25);
 	r = a + b;
 	BOOST_CHECK_EQUAL (r.h, 3);
 	BOOST_CHECK_EQUAL (r.m, 6);
-	BOOST_CHECK_EQUAL (r.s, 9);
-	BOOST_CHECK_EQUAL (r.t, 110);
-	BOOST_CHECK_EQUAL (r.to_string(), "3:6:9:110");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 2792360);
+	BOOST_CHECK_EQUAL (r.s, 8);
+	BOOST_CHECK_EQUAL (r.e, 3);
+	BOOST_CHECK_EQUAL (r.to_string(), "3:6:8:3");
 
-	a = dcp::Time (24, 12, 6, 3);
-	b = dcp::Time (16, 8, 4, 2);
+	/* Another arbitrary tcr (30) */
+	a = dcp::Time (24, 12, 6, 3, 30);
+	b = dcp::Time (16, 8, 4, 2, 30);
 	BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5);
 
-	BOOST_CHECK_EQUAL (dcp::Time (4128391203LL).to_ticks(), 4128391203LL);
-	BOOST_CHECK_EQUAL (dcp::Time (60000).to_ticks(), 60000);
+	a = dcp::Time (3600 * 24, 24, 250);
+	BOOST_CHECK_EQUAL (a.h, 1);
+	BOOST_CHECK_EQUAL (a.m, 0);
+	BOOST_CHECK_EQUAL (a.s, 0);
+	BOOST_CHECK_EQUAL (a.e, 0);
+
+	a = dcp::Time (60 * 24, 24, 250);
+	BOOST_CHECK_EQUAL (a.h, 0);
+	BOOST_CHECK_EQUAL (a.m, 1);
+	BOOST_CHECK_EQUAL (a.s, 0);
+	BOOST_CHECK_EQUAL (a.e, 0);
 
 	/* Check rounding; 3424 is 142.666666666... seconds or 0.166666666... ticks */
-	a = dcp::Time (3424, 24);
+	a = dcp::Time (3424, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
-	BOOST_CHECK_EQUAL (a.t, 167);
+	BOOST_CHECK_EQUAL (a.e, 167);
 
-	a = dcp::Time (3425, 24);
+	a = dcp::Time (3425, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
-	BOOST_CHECK_EQUAL (a.t, 177);
+	BOOST_CHECK_EQUAL (a.e, 177);
+
+	/* Check addition of times with different tcrs */
+	a = dcp::Time (0, 0, 0, 3, 24);
+	b = dcp::Time (0, 0, 0, 4, 48);
+	r = a + b;
+	BOOST_CHECK_EQUAL (r, dcp::Time (0, 0, 0, 240, 1152));
 }