diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-03-09 16:45:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-03-11 22:24:28 +0100 |
| commit | 5ff6b15ef3c58a046fb9eec0273c5e7322988a14 (patch) | |
| tree | 26740a36eea1d61aeb62445671c4c2f3a8017de9 /test/ffmpeg_encoder_test.cc | |
| parent | ffe35585f08d0a5aeccf3e32f9c4cd2a5a6f43f5 (diff) | |
Move private_data into TestPaths
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 1acfa96df..10186abcc 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -85,19 +85,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, 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, 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, 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 */ @@ -105,7 +105,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(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); @@ -319,7 +319,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(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()); @@ -349,9 +349,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(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(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); |