diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-04 22:04:40 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-10-13 18:51:11 +0200 |
| commit | 5d937606cf96d163be98920fa5619114a28eec9d (patch) | |
| tree | 8e36025e51f2eaa9476de4c48810126a2f071127 /test/ffmpeg_encoder_test.cc | |
| parent | 7b302908e4b6186c44fd3a97aa4ba0716fb8674f (diff) | |
Fix use of DCPOMATIC_TEST_PRIVATE variable to specify where
test private data is.
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 178ed5296..1b030ce80 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -88,19 +88,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1) /** Dolby Aurora trailer VOB -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2) { - ffmpeg_content_test (2, TestPaths::private_data / "dolby_aurora.vob", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", EXPORT_FORMAT_PRORES); } /** Sintel trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test3) { - ffmpeg_content_test (3, TestPaths::private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (3, TestPaths::private_data() / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES); } /** Big Buck Bunny trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4) { - ffmpeg_content_test (4, TestPaths::private_data / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES); + ffmpeg_content_test (4, TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES); } /** Still image -> Prores */ @@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) { shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test5"); film->set_name ("ffmpeg_encoder_prores_test5"); - shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data / "bbc405.png")); + shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png")); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); @@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) { shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov"); - film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png"))); + film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png"))); BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); @@ -352,9 +352,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) { shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test7_data"); - shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png"))); + shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png"))); film->examine_and_add_content (L); - shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png"))); + shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png"))); film->examine_and_add_content (R); BOOST_REQUIRE (!wait_for_jobs()); L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); @@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9) { shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test9"); film->set_name ("ffmpeg_encoder_prores_test9"); - shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data / "bbc405.png")); + shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png")); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (12); |