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

[dcpomatic.git] / test / video_level_test.cc

diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 0ff2c47321231e0f27ff0ed154893fe561ae69ef..bb2c1b7fac456f937be3825edc0bc4619bff66a7 100644 (file)
--- 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());