24 files changed, 101 insertions, 101 deletions

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 8d7dcd143..e8ecc0048 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -30,7 +30,7 @@
 #include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/log_entry.h"
 #include "lib/ratio.h"
 #include "lib/text_content.h"
@@ -39,9 +39,9 @@
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_mono_picture_asset.h>
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()->asset());
 	auto pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
 		dcp.cpls().front()->reels().front()->main_picture()
-		)->mono_asset();
+		)->mono_j2k_asset();
 	BOOST_REQUIRE (pic);
 	auto frame = pic->start_read()->get_frame(12);
 	auto xyz = frame->xyz_image ();
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(burn_empty_subtitle_test)
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	auto file = boost::filesystem::path("build") / "test" / "burnt_empty_subtitle_test.mov";
 	cl.add(file);
-	FFmpegEncoder encoder(film, job, file, ExportFormat::PRORES_4444, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, file, ExportFormat::PRORES_4444, false, false, false, 23);
 	encoder.go();
 
 	cl.run();
diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc
index aae5fb6de..09f1a4538 100644
--- a/test/create_cli_test.cc
+++ b/test/create_cli_test.cc
@@ -179,11 +179,11 @@ BOOST_AUTO_TEST_CASE (create_cli_test)
 	BOOST_CHECK_EQUAL(cc._fourk, true);
 	BOOST_CHECK (!cc.error);
 
-	cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4");
+	cc = run ("dcpomatic2_create --video-bit-rate 120 foo.mp4");
 	BOOST_REQUIRE_EQUAL (cc.content.size(), 1U);
 	BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
-	BOOST_REQUIRE(cc._j2k_bandwidth);
-	BOOST_CHECK_EQUAL(*cc._j2k_bandwidth, 120000000);
+	BOOST_REQUIRE(cc._video_bit_rate);
+	BOOST_CHECK_EQUAL(*cc._video_bit_rate, 120000000);
 	BOOST_CHECK (!cc.error);
 
 	cc = run ("dcpomatic2_create --channel L fred.wav --channel R jim.wav sheila.wav");
diff --git a/test/data b/test/data
-Subproject ddf878730354cdec8a802a59543591f6f943f5c
+Subproject 06f2a187ab398bc2e26034d4e0b178610315b63
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 837362e84..e62bd70ba 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -37,7 +37,7 @@
 #include "lib/text_content.h"
 #include "lib/text_decoder.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -327,7 +327,7 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
 		});
 
-	dcp::MonoPictureAsset burnt(dcp_file(film, "j2c_"));
+	dcp::MonoJ2KPictureAsset burnt(dcp_file(film, "j2c_"));
 	auto frame = burnt.start_read()->get_frame(12)->xyz_image();
 	auto const size = frame->size();
 	int max_X = 0;
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index f0133ff66..67bc0ce1e 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -28,8 +28,8 @@
 #include "lib/dcp_content.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/ffmpeg_encoder.h"
 #include "lib/ffmpeg_examiner.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/film.h"
 #include "lib/image_content.h"
 #include "lib/ratio.h"
@@ -84,7 +84,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	auto file = boost::filesystem::path("build") / "test" / String::compose("%1.%2", name, extension);
 	cl.add (file);
-	FFmpegEncoder encoder (film, job, file, format, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, file, format, false, false, false, 23);
 	encoder.go ();
 
 	cl.run ();
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 
 	film->write_metadata ();
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	film->write_metadata();
 
 	auto job = make_shared<TranscodeJob> (film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	film->write_metadata();
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", ExportFormat::H264_AAC, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", ExportFormat::H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -237,7 +237,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	film->write_metadata();
 
 	auto job = make_shared<TranscodeJob> (film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", ExportFormat::H264_AAC, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", ExportFormat::H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
 	film->set_container(Ratio::from_id("185"));
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", ExportFormat::H264_AAC, false, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", ExportFormat::H264_AAC, false, false, false, 23);
 	encoder.go();
 }
 
@@ -306,7 +306,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 	Rs->audio->set_mapping (map);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go ();
 
 	check_ffmpeg ("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", 1);
@@ -334,7 +334,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 	}
 
 	auto job = make_shared<TranscodeJob>(film2, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264)
 	auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp});
 
 	auto job = make_shared<TranscodeJob>(film2, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film2, job, "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -368,7 +368,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 	auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export", {dcp});
 
 	auto job = make_shared<TranscodeJob> (film2, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
 	film->set_three_d(true);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_2d_content_in_3d_project.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_2d_content_in_3d_project.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go();
 }
 
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 	film->set_audio_channels (2);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", ExportFormat::H264_AAC, true, false, false, 23);
 	encoder.go();
 }
 
@@ -415,7 +415,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 
 	film->write_metadata ();
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", ExportFormat::H264_AAC, false, false, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", ExportFormat::H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
 	film->write_metadata ();
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES_HQ, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -445,7 +445,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop)
 	film->write_metadata ();
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::H264_AAC, false, false, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -461,7 +461,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
 	content2->video->set_length (240);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_with_reels.mov", ExportFormat::H264_AAC, false, true, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_with_reels.mov", ExportFormat::H264_AAC, false, true, false, 23);
 	encoder.go ();
 
 	auto check = [](boost::filesystem::path path) {
@@ -485,7 +485,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
 	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
 	encoder.go ();
 
 	cl.add("build/test/ffmpeg_encoder_prores_regression_1.mov");
@@ -505,7 +505,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
+	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
 	encoder.go ();
 
 	dcpomatic_log->set_types(logs);
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(ffmpeg_encoder_missing_frame_at_end)
 	boost::filesystem::path log("build/test/ffmpeg_encoder_missing_frame_at_end.log");
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	FFmpegEncoder encoder(film, job, output, ExportFormat::PRORES_HQ, false, true, false, 23);
+	FFmpegFilmEncoder encoder(film, job, output, ExportFormat::PRORES_HQ, false, true, false, 23);
 	encoder.go();
 
 	run_ffprobe(output, log, false, "-show_frames -show_format -show_streams -select_streams v:0");
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 2bd60dc81..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_j2k_bandwidth (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_encode_threading_test.cc b/test/j2k_encode_threading_test.cc
index ff2e7b0dc..ee219fbe0 100644
--- a/test/j2k_encode_threading_test.cc
+++ b/test/j2k_encode_threading_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/config.h"
 #include "lib/content_factory.h"
-#include "lib/dcp_encoder.h"
+#include "lib/dcp_film_encoder.h"
 #include "lib/dcp_transcode_job.h"
 #include "lib/encode_server_description.h"
 #include "lib/film.h"
@@ -99,10 +99,10 @@ BOOST_AUTO_TEST_CASE(frames_not_lost_when_threads_disappear)
 	auto film = new_test_film2("frames_not_lost", content);
 	film->write_metadata();
 	auto job = make_dcp(film, TranscodeJob::ChangedBehaviour::IGNORE);
-	auto& encoder = dynamic_pointer_cast<DCPEncoder>(job->_encoder)->_j2k_encoder;
+	auto encoder = dynamic_cast<J2KEncoder*>(dynamic_pointer_cast<DCPFilmEncoder>(job->_encoder)->_encoder.get());
 
 	while (JobManager::instance()->work_to_do()) {
-		encoder.remake_threads(rand() % 8, 0, {});
+		encoder->remake_threads(rand() % 8, 0, {});
 		dcpomatic_sleep_seconds(1);
 	}
 
diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_video_bit_rate_test.cc
index f9e47c4b9..ab4c4271e 100644
--- a/test/j2k_bandwidth_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_j2k_bandwidth (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/kdm_cli_test.cc b/test/kdm_cli_test.cc
index 6e54f3a6c..2a508d97c 100644
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_specify_decryption_key_test)
 	output.clear();
 	error = run(bad_args, output, false);
 	BOOST_REQUIRE(error);
-	BOOST_CHECK(error->find("Could not decrypt KDM") != string::npos);
+	BOOST_CHECK_MESSAGE(error->find("Could not decrypt KDM") != string::npos, "Error was " << *error);
 
 	vector<string> good_args = {
 		"kdm_cli",
diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc
index cad7d7d26..50514041b 100644
--- a/test/optimise_stills_test.cc
+++ b/test/optimise_stills_test.cc
@@ -22,7 +22,6 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
-#include "lib/dcp_encoder.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/film.h"
 #include "lib/job_manager.h"
diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index cb5fcb430..638f606d3 100644
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -30,8 +30,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (overlap_video_test1)
 	BOOST_REQUIRE (reel->main_picture());
 	auto mono_picture = dynamic_pointer_cast<dcp::ReelMonoPictureAsset>(reel->main_picture());
 	BOOST_REQUIRE (mono_picture);
-	auto asset = mono_picture->mono_asset();
+	auto asset = mono_picture->mono_j2k_asset();
 	BOOST_REQUIRE (asset);
 	BOOST_CHECK_EQUAL (asset->intrinsic_duration(), fps * 5);
 	auto reader = asset->start_read ();
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 63c611831..01b71a05e 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -33,8 +33,8 @@
 #include "lib/video_content.h"
 #include "lib/ratio.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -94,8 +94,8 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 		false
 		);
 
-	auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d/original.mxf");
-	auto B = make_shared<dcp::MonoPictureAsset>(video);
+	auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d/original.mxf");
+	auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
 		false
 		);
 
-	auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
-	auto B = make_shared<dcp::StereoPictureAsset>(video);
+	auto A = make_shared<dcp::StereoJ2KPictureAsset>("build/test/recover_test_3d/original.mxf");
+	auto B = make_shared<dcp::StereoJ2KPictureAsset>(video);
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -181,9 +181,9 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
 		false
 		);
 
-	auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
+	auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
 	A->set_key (film->key ());
-	auto B = make_shared<dcp::MonoPictureAsset>(video);
+	auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
 	B->set_key (film->key ());
 
 	dcp::EqualityOptions eq;
diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index ec2469898..f81e8e333 100644
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -30,6 +30,7 @@
 #include "lib/content_factory.h"
 #include "lib/cross.h"
 #include "lib/film.h"
+#include "lib/frame_info.h"
 #include "lib/reel_writer.h"
 #include "lib/video_content.h"
 #include "test.h"
@@ -46,9 +47,9 @@ using std::string;
 using boost::optional;
 
 
-static bool equal (dcp::FrameInfo a, ReelWriter const & writer, shared_ptr<InfoFileHandle> file, Frame frame, Eyes eyes)
+static bool equal(J2KFrameInfo a, shared_ptr<InfoFileHandle> file, Frame frame, Eyes eyes)
 {
-	auto b = writer.read_frame_info(file, frame, eyes);
+	auto b = J2KFrameInfo(file, frame, eyes);
 	return a.offset == b.offset && a.size == b.size && a.hash == b.hash;
 }
 
@@ -61,44 +62,44 @@ BOOST_AUTO_TEST_CASE (write_frame_info_test)
 
 	/* Write the first one */
 
-	dcp::FrameInfo info1(0, 123, "12345678901234567890123456789012");
-	writer.write_frame_info (0, Eyes::LEFT, info1);
+	J2KFrameInfo info1(0, 123, "12345678901234567890123456789012");
+	info1.write(film->info_file_handle(period, false), 0, Eyes::LEFT);
 	{
 		auto file = film->info_file_handle(period, true);
-		BOOST_CHECK (equal(info1, writer, file, 0, Eyes::LEFT));
+		BOOST_CHECK(equal(info1, file, 0, Eyes::LEFT));
 	}
 
 	/* Write some more */
 
-	dcp::FrameInfo info2(596, 14921, "123acb789f1234ae782012n456339522");
-	writer.write_frame_info (5, Eyes::RIGHT, info2);
+	J2KFrameInfo info2(596, 14921, "123acb789f1234ae782012n456339522");
+	info2.write(film->info_file_handle(period, false), 5, Eyes::RIGHT);
 
 	{
 		auto file = film->info_file_handle(period, true);
-		BOOST_CHECK (equal(info1, writer, file, 0, Eyes::LEFT));
-		BOOST_CHECK (equal(info2, writer, file, 5, Eyes::RIGHT));
+		BOOST_CHECK(equal(info1, file, 0, Eyes::LEFT));
+		BOOST_CHECK(equal(info2, file, 5, Eyes::RIGHT));
 	}
 
-	dcp::FrameInfo info3(12494, 99157123, "xxxxyyyyabc12356ffsfdsf456339522");
-	writer.write_frame_info (10, Eyes::LEFT, info3);
+	J2KFrameInfo info3(12494, 99157123, "xxxxyyyyabc12356ffsfdsf456339522");
+	info3.write(film->info_file_handle(period, false), 10, Eyes::LEFT);
 
 	{
 		auto file = film->info_file_handle(period, true);
-		BOOST_CHECK (equal(info1, writer, file, 0, Eyes::LEFT));
-		BOOST_CHECK (equal(info2, writer, file, 5, Eyes::RIGHT));
-		BOOST_CHECK (equal(info3, writer, file, 10, Eyes::LEFT));
+		BOOST_CHECK(equal(info1, file, 0, Eyes::LEFT));
+		BOOST_CHECK(equal(info2, file, 5, Eyes::RIGHT));
+		BOOST_CHECK(equal(info3, file, 10, Eyes::LEFT));
 	}
 
 	/* Overwrite one */
 
-	dcp::FrameInfo info4(55512494, 123599157123, "ABCDEFGyabc12356ffsfdsf4563395ZZ");
-	writer.write_frame_info (5, Eyes::RIGHT, info4);
+	J2KFrameInfo info4(55512494, 123599157123, "ABCDEFGyabc12356ffsfdsf4563395ZZ");
+	info4.write(film->info_file_handle(period, false), 5, Eyes::RIGHT);
 
 	{
 		auto file = film->info_file_handle(period, true);
-		BOOST_CHECK (equal(info1, writer, file, 0, Eyes::LEFT));
-		BOOST_CHECK (equal(info4, writer, file, 5, Eyes::RIGHT));
-		BOOST_CHECK (equal(info3, writer, file, 10, Eyes::LEFT));
+		BOOST_CHECK(equal(info1, file, 0, Eyes::LEFT));
+		BOOST_CHECK(equal(info4, file, 5, Eyes::RIGHT));
+		BOOST_CHECK(equal(info3, file, 10, Eyes::LEFT));
 	}
 }
 
diff --git a/test/reels_test.cc b/test/reels_test.cc
index df4bbbbe6..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_j2k_bandwidth (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_j2k_bandwidth (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/remake_video_test.cc b/test/remake_video_test.cc
index a07659844..2afe90b63 100644
--- a/test/remake_video_test.cc
+++ b/test/remake_video_test.cc
@@ -26,7 +26,7 @@
 #include <dcp/colour_conversion.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(remake_video_after_yub_rgb_matrix_changed)
 		BOOST_REQUIRE(!cpl->reels().empty());
 		auto reel = cpl->reels()[0];
 		BOOST_REQUIRE(reel->main_picture());
-		auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(reel->main_picture()->asset());
+		auto mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel->main_picture()->asset());
 		BOOST_REQUIRE(mono);
 		auto reader = mono->start_read();
 
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index b704ccef2..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_j2k_bandwidth (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 4064f9b0e..ddd3d26f0 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,8 +47,8 @@
 #include <dcp/dcp.h>
 #include <dcp/equality_options.h>
 #include <dcp/filesystem.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -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_j2k_bandwidth (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);
@@ -829,10 +829,10 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 {
 	dcp::DCP dcp (dcp_dir);
 	dcp.read ();
-	auto asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
+	auto asset = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
 	BOOST_REQUIRE (asset);
 	auto frame = asset->start_read()->get_frame(index);
-	dcp::MonoPictureFrame ref_frame(ref);
+	dcp::MonoJ2KPictureFrame ref_frame(ref);
 
 	auto image = frame->xyz_image ();
 	auto ref_image = ref_frame.xyz_image();
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 78d74add4..38b8f36d4 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -42,8 +42,8 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -330,10 +330,10 @@ BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("th
 
 	BOOST_REQUIRE_EQUAL(matches.size(), 1U);
 
-	auto stereo = dcp::StereoPictureAsset(matches[0]);
+	auto stereo = dcp::StereoJ2KPictureAsset(matches[0]);
 	auto stereo_reader = stereo.start_read();
 
-	auto mono = dcp::MonoPictureAsset(dcp_file(film, "j2c"));
+	auto mono = dcp::MonoJ2KPictureAsset(dcp_file(film, "j2c"));
 	auto mono_reader = mono.start_read();
 
 	BOOST_REQUIRE_EQUAL(stereo.intrinsic_duration(), mono.intrinsic_duration());
diff --git a/test/torture_test.cc b/test/torture_test.cc
index 8e6a516bd..e5ce694ce 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -35,8 +35,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	auto reel_picture = reels.front()->main_picture();
 	BOOST_REQUIRE (reel_picture);
-	auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset> (reel_picture->asset());
+	auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel_picture->asset());
 	BOOST_REQUIRE (picture);
 	BOOST_CHECK_EQUAL (picture->intrinsic_duration(), 144);
 
diff --git a/test/vf_test.cc b/test/vf_test.cc
index ca987b22d..051712deb 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -40,8 +40,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/picture_asset_writer.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/j2k_picture_asset_writer.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
@@ -492,8 +492,8 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 	dcp::DCP ov(path / "ov");
 
 	auto make_picture = [path](string filename) {
-		auto pic = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
-		auto writer = pic->start_write(path / "ov" / filename, dcp::PictureAsset::Behaviour::MAKE_NEW);
+		auto pic = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+		auto writer = pic->start_write(path / "ov" / filename, dcp::Behaviour::MAKE_NEW);
 		auto frame = dcp::ArrayData("test/data/picture.j2c");
 		for (int i = 0; i < 240; ++i) {
 			writer->write(frame);
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 0ff2c4732..bb2c1b7fa 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -36,7 +36,7 @@
 #include "lib/image.h"
 #include "lib/image_content.h"
 #include "lib/image_decoder.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/job_manager.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
@@ -45,8 +45,8 @@
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -275,7 +275,7 @@ pixel_range (boost::filesystem::path dcp_path)
 	dcp::DCP dcp (dcp_path);
 	dcp.read ();
 
-	auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
+	auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
 	BOOST_REQUIRE (picture);
 	auto frame = picture->start_read()->get_frame(0)->xyz_image();
 
@@ -459,7 +459,7 @@ V_movie_range (shared_ptr<Film> film)
 {
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	job->set_encoder (
-		make_shared<FFmpegEncoder>(film, job, film->file("export.mov"), ExportFormat::PRORES_HQ, true, false, false, 23)
+		make_shared<FFmpegFilmEncoder>(film, job, film->file("export.mov"), ExportFormat::PRORES_HQ, true, false, false, 23)
 		);
 	JobManager::instance()->add (job);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index f3766e4af..819706803 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -33,7 +33,7 @@
 #include "lib/video_mxf_content.h"
 #include "test.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -70,9 +70,9 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 			dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K
 		});
 
-	auto ref = make_shared<dcp::MonoPictureAsset>(ref_mxf);
+	auto ref = make_shared<dcp::MonoJ2KPictureAsset>(ref_mxf);
 	boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
-	auto comp = make_shared<dcp::MonoPictureAsset>(*i);
+	auto comp = make_shared<dcp::MonoJ2KPictureAsset>(*i);
 	dcp::EqualityOptions op;
 	BOOST_CHECK (ref->equals (comp, op, note));
 }
diff --git a/test/writer_test.cc b/test/writer_test.cc
index 86b60818f..2d4da570f 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
-#include "lib/dcp_encoder.h"
+#include "lib/dcp_film_encoder.h"
 #include "lib/film.h"
 #include "lib/job.h"
 #include "lib/video_content.h"
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(writer_progress_test)
 		last_sub_name = job->sub_name();
 	});
 
-	DCPEncoder encoder(film, job);
+	DCPFilmEncoder encoder(film, job);
 	encoder.go();
 }
 
diff --git a/test/wscript b/test/wscript
index eb8901338..3acca09e8 100644
--- a/test/wscript
+++ b/test/wscript
@@ -111,9 +111,9 @@ def build(bld):
                  import_dcp_test.cc
                  interrupt_encoder_test.cc
                  isdcf_name_test.cc
-                 j2k_bandwidth_test.cc
                  j2k_encode_threading_test.cc
                  job_manager_test.cc
+                 j2k_video_bit_rate_test.cc
                  kdm_cli_test.cc
                  kdm_naming_test.cc
                  kdm_util_test.cc