diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-09 22:13:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-29 10:35:55 +0200 |
| commit | 2d82f86d2f99b812edd5d64d13f3dd5a4950719e (patch) | |
| tree | 58214917cec0f6f829f85f4919d5f2c532b93d64 /test | |
| parent | 98a0aa443e10d1db466c575fd854bef841988534 (diff) | |
Remove default video bit rate settings.
Diffstat (limited to 'test')
| -rw-r--r-- | test/content_test.cc | 1 | ||||
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/no_use_video_test.cc | 1 | ||||
| -rw-r--r-- | test/remake_with_subtitle_test.cc | 1 | ||||
| -rw-r--r-- | test/subtitle_reel_number_test.cc | 1 | ||||
| -rw-r--r-- | test/test.cc | 1 |
6 files changed, 4 insertions, 1 deletions
diff --git a/test/content_test.cc b/test/content_test.cc index 06d186da6..b9a25a02b 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -146,6 +146,7 @@ BOOST_AUTO_TEST_CASE (content_test6) ); film->set_audio_channels(16); + film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000); make_and_verify_dcp (film); check_dcp (TestPaths::private_data() / "v2.18.x" / "fha", film); diff --git a/test/data b/test/data -Subproject a70f9301976da3137b61d217ccdc13ee8c615a5 +Subproject 04dde6faddc797652ead4f75d27dfdd48db77dd diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc index cd8df90cb..441d64166 100644 --- a/test/no_use_video_test.cc +++ b/test/no_use_video_test.cc @@ -77,6 +77,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2) auto A = content_factory(TestPaths::private_data() / "dolby_aurora.vob")[0]; auto B = content_factory(TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov")[0]; auto film = new_test_film("no_use_video_test2", { A, B }, &cl); + film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000); A->set_position (film, dcpomatic::DCPTime()); B->set_position (film, dcpomatic::DCPTime()); A->video->set_use (false); diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc index 49e41bff3..c46a4f70d 100644 --- a/test/remake_with_subtitle_test.cc +++ b/test/remake_with_subtitle_test.cc @@ -36,6 +36,7 @@ using std::dynamic_pointer_cast; BOOST_AUTO_TEST_CASE (remake_with_subtitle_test) { auto film = new_test_film("remake_with_subtitle_test"); + film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000); auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv")[0]); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc index caff70778..0648ec477 100644 --- a/test/subtitle_reel_number_test.cc +++ b/test/subtitle_reel_number_test.cc @@ -52,6 +52,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) film->set_reel_type (ReelType::BY_LENGTH); film->set_interop (true); film->set_reel_length (1024 * 1024 * 512); + film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000); make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD}); dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name()); diff --git a/test/test.cc b/test/test.cc index f81db8f91..8efbf3225 100644 --- a/test/test.cc +++ b/test/test.cc @@ -121,7 +121,6 @@ setup_test_config () Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); Config::instance()->set_default_audio_delay (0); - Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, 100000000); Config::instance()->set_default_interop (false); Config::instance()->set_default_still_length (10); Config::instance()->set_log_types ( |