Allow specification of video bit rate separately for J2K and MPEG2.

6 files changed, 6 insertions, 6 deletions

diff --git a/test/data b/test/data
-Subproject 3ab3245220bd2a11cdf2e16a28221e4de063bef
+Subproject 06f2a187ab398bc2e26034d4e0b178610315b63
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 2f1346d1d..c52df6d72 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	film->set_name ("fred");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("SHR"));
 	film->set_container (Ratio::from_id ("185"));
-	film->set_video_bit_rate(200000000);
+	film->set_video_bit_rate(VideoEncoding::JPEG2000, 200000000);
 	film->set_interop (false);
 	film->set_chain (string(""));
 	film->set_distributor (string(""));
diff --git a/test/j2k_video_bit_rate_test.cc b/test/j2k_video_bit_rate_test.cc
index 67579a369..ab4c4271e 100644
--- a/test/j2k_video_bit_rate_test.cc
+++ b/test/j2k_video_bit_rate_test.cc
@@ -47,7 +47,7 @@ check (int target_bits_per_second)
 	auto film = new_test_film (name);
 	film->set_name (name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	film->set_video_bit_rate(target_bits_per_second);
+	film->set_video_bit_rate(VideoEncoding::JPEG2000, target_bits_per_second);
 	auto content = make_shared<ImageContent>(TestPaths::private_data() / "prophet_frame.tiff");
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 5fcddfe78..e6d8cf9c6 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 	BOOST_CHECK_EQUAL (r.back().from.get(), 288000);
 	BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2);
 
-	film->set_video_bit_rate(100000000);
+	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	film->set_reel_type (ReelType::BY_LENGTH);
 	/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
 	film->set_reel_length (31253154);
@@ -310,7 +310,7 @@ BOOST_AUTO_TEST_CASE (reels_test6)
 	auto A = make_shared<FFmpegContent>("test/data/test2.mp4");
 	auto film = new_test_film2 ("reels_test6", {A});
 
-	film->set_video_bit_rate(100000000);
+	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	film->set_reel_type (ReelType::BY_LENGTH);
 	/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
 	film->set_reel_length (31253154);
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index bd969bdb2..e26a09169 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -45,7 +45,7 @@ void check_within_n (int64_t a, int64_t b, int64_t n)
 BOOST_AUTO_TEST_CASE (required_disk_space_test)
 {
 	auto film = new_test_film ("required_disk_space_test");
-	film->set_video_bit_rate(100000000);
+	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	film->set_audio_channels(8);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	auto content_a = content_factory("test/data/flat_blue.png")[0];
diff --git a/test/test.cc b/test/test.cc
index 1d5eb9083..ddd3d26f0 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -122,7 +122,7 @@ setup_test_config ()
 	Config::instance()->set_server_port_base (61921);
 	Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 	Config::instance()->set_default_audio_delay (0);
-	Config::instance()->set_default_video_bit_rate(100000000);
+	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_default_dcp_audio_channels(8);