Fix test for time rounding change.
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Jul 2015 20:31:24 +0000 (21:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Jul 2015 20:31:24 +0000 (21:31 +0100)
test/time_calculation_test.cc

index 6598e46336d7ac0dca3b90890890a9e8c9749b72..de300655dd757d3955885edeba406142227611f1 100644 (file)
@@ -31,7 +31,7 @@ static string const xml = "<Content>"
        "<Type>FFmpeg</Type>"
        "<BurnSubtitles>0</BurnSubtitles>"
        "<BitsPerPixel>8</BitsPerPixel>"
-       "<Path>/home/c.hetherington/DCP/clapperboard.mp4</Path>"
+       "<Path>test/data/red_24.mp4</Path>"
        "<Digest>2760e03c7251480f7f02c01a907792673784335</Digest>"
        "<Position>0</Position>"
        "<TrimStart>0</TrimStart>"
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)),   0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.00)),   0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (4.60)),  40);
-       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 169);
+       BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (9.75)), 168);
 
        /* Position 3s, 1.6s trim, content rate 24, DCP rate 25.  Here the trim is in ContentTime,
           so it's 1.6s at 24fps.