diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-14 21:31:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-14 21:31:24 +0100 |
| commit | da267d008b9bb122f0617a067021703da5c673bb (patch) | |
| tree | 15fc6504fa564708a08350bb9b45163f9f76bd5f /test/time_calculation_test.cc | |
| parent | 0d6a18d8c1d80f4badb06929b90515bf121595b5 (diff) | |
Fix test for time rounding change.
Diffstat (limited to 'test/time_calculation_test.cc')
| -rw-r--r-- | test/time_calculation_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index 6598e4633..de300655d 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -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. |