summaryrefslogtreecommitdiff
path: root/test/ffmpeg_encoder_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
-rw-r--r--test/ffmpeg_encoder_test.cc158
1 files changed, 72 insertions, 86 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index dc57b473b..0a48cd745 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"
@@ -69,6 +69,10 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
name += "prores-hq";
extension = "mov";
break;
+ case ExportFormat::PRORES_LT:
+ name += "prores-lt";
+ extension = "mov";
+ break;
case ExportFormat::SUBTITLES_DCP:
BOOST_REQUIRE (false);
}
@@ -76,7 +80,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
name = String::compose("%1_test%2", name, number);
auto c = make_shared<FFmpegContent>(content);
- auto film = new_test_film2 (name, {c}, &cl);
+ auto film = new_test_film(name, {c}, &cl);
film->set_name (name);
film->set_audio_channels (6);
@@ -84,7 +88,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 ();
@@ -122,42 +126,39 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4)
/** Still image -> Prores */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
{
- auto film = new_test_film ("ffmpeg_encoder_prores_test5");
- film->set_name ("ffmpeg_encoder_prores_test5");
+ boost::filesystem::path const output = "build/test/ffmpeg_encoder_prores_test5.mov";
+ Cleanup cl;
+ cl.add(output);
+
auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
- film->set_container (Ratio::from_id ("185"));
+ auto film = new_test_film("ffmpeg_encoder_prores_test5", { c });
film->set_audio_channels (6);
- film->examine_and_add_content (c);
- BOOST_REQUIRE (!wait_for_jobs ());
-
c->video->set_length (240);
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, output, ExportFormat::PRORES_HQ, false, false, false, 23);
encoder.go ();
+
+ cl.run();
}
/** Subs -> Prores */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
{
- auto film = new_test_film ("ffmpeg_encoder_prores_test6");
- film->set_name ("ffmpeg_encoder_prores_test6");
- film->set_container (Ratio::from_id ("185"));
+ auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+ auto film = new_test_film("ffmpeg_encoder_prores_test6", { s });
film->set_audio_channels (6);
- auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
- film->examine_and_add_content (s);
- BOOST_REQUIRE (!wait_for_jobs ());
s->only_text()->set_colour (dcp::Colour (255, 255, 0));
s->only_text()->set_effect (dcp::Effect::SHADOW);
s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
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 ();
}
@@ -165,25 +166,24 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
/** Video + subs -> Prores */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
{
- auto film = new_test_film ("ffmpeg_encoder_prores_test7");
- film->set_name ("ffmpeg_encoder_prores_test7");
- film->set_container (Ratio::from_id ("185"));
- film->set_audio_channels (6);
+ boost::filesystem::path const output = "build/test/ffmpeg_encoder_prores_test7.mov";
+ Cleanup cl;
+ cl.add(output);
auto c = make_shared<FFmpegContent>("test/data/test.mp4");
- film->examine_and_add_content (c);
- BOOST_REQUIRE (!wait_for_jobs ());
-
auto s = make_shared<StringTextFileContent>("test/data/subrip.srt");
- film->examine_and_add_content (s);
- BOOST_REQUIRE (!wait_for_jobs ());
+ auto film = new_test_film("ffmpeg_encoder_prores_test7", { c, s });
+ film->set_audio_channels (6);
+
s->only_text()->set_colour (dcp::Colour (255, 255, 0));
s->only_text()->set_effect (dcp::Effect::SHADOW);
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, output, ExportFormat::PRORES_HQ, false, false, false, 23);
encoder.go ();
+
+ cl.run();
}
@@ -197,21 +197,17 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test1)
/** Just subtitles -> H264 */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
{
- auto film = new_test_film ("ffmpeg_encoder_h264_test2");
- film->set_name ("ffmpeg_encoder_h264_test2");
- film->set_container (Ratio::from_id ("185"));
+ auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+ auto film = new_test_film("ffmpeg_encoder_h264_test2", { s });
film->set_audio_channels (6);
- auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
- film->examine_and_add_content (s);
- BOOST_REQUIRE (!wait_for_jobs ());
s->only_text()->set_colour (dcp::Colour (255, 255, 0));
s->only_text()->set_effect (dcp::Effect::SHADOW);
s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
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 ();
}
@@ -219,25 +215,18 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
/** Video + subs -> H264 */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
{
- auto film = new_test_film ("ffmpeg_encoder_h264_test3");
- film->set_name ("ffmpeg_encoder_h264_test3");
- film->set_container (Ratio::from_id ("185"));
- film->set_audio_channels (6);
-
auto c = make_shared<FFmpegContent>("test/data/test.mp4");
- film->examine_and_add_content (c);
- BOOST_REQUIRE (!wait_for_jobs());
-
auto s = make_shared<StringTextFileContent>("test/data/subrip.srt");
- film->examine_and_add_content (s);
- BOOST_REQUIRE (!wait_for_jobs ());
+ auto film = new_test_film("ffmpeg_encoder_h264_test3", { c, s });
+ film->set_audio_channels (6);
+
s->only_text()->set_colour (dcp::Colour (255, 255, 0));
s->only_text()->set_effect (dcp::Effect::SHADOW);
s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
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 ();
}
@@ -245,13 +234,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
/** Scope-in-flat DCP -> H264 */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
{
- auto film = new_test_film2("ffmpeg_encoder_h264_test4", {make_shared<DCPContent>("test/data/scope_dcp")});
+ auto film = new_test_film("ffmpeg_encoder_h264_test4", {make_shared<DCPContent>("test/data/scope_dcp")});
BOOST_REQUIRE(!wait_for_jobs());
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();
}
@@ -259,24 +248,15 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
/** Test mixdown from 5.1 to stereo */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
{
- auto film = new_test_film ("ffmpeg_transcoder_h264_test5");
- film->set_name ("ffmpeg_transcoder_h264_test5");
- film->set_container (Ratio::from_id ("185"));
- film->set_audio_channels (6);
-
auto L = make_shared<FFmpegContent>("test/data/L.wav");
- film->examine_and_add_content (L);
auto R = make_shared<FFmpegContent>("test/data/R.wav");
- film->examine_and_add_content (R);
auto C = make_shared<FFmpegContent>("test/data/C.wav");
- film->examine_and_add_content (C);
auto Ls = make_shared<FFmpegContent>("test/data/Ls.wav");
- film->examine_and_add_content (Ls);
auto Rs = make_shared<FFmpegContent>("test/data/Rs.wav");
- film->examine_and_add_content (Rs);
auto Lfe = make_shared<FFmpegContent>("test/data/Lfe.wav");
- film->examine_and_add_content (Lfe);
- BOOST_REQUIRE (!wait_for_jobs ());
+
+ auto film = new_test_film("ffmpeg_encoder_h264_test5", { L, R, C, Ls, Rs, Lfe });
+ film->set_audio_channels (6);
AudioMapping map (1, MAX_DCP_AUDIO_CHANNELS);
@@ -306,7 +286,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);
@@ -316,12 +296,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
/** Test export of a VF */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
{
- auto film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov");
+ auto film = new_test_film("ffmpeg_encoder_h264_test6_ov");
film->examine_and_add_content (make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png"));
BOOST_REQUIRE (!wait_for_jobs());
make_and_verify_dcp (film);
- auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test6_vf");
+ auto film2 = new_test_film("ffmpeg_encoder_h264_test6_vf");
auto ov = make_shared<DCPContent>("build/test/ffmpeg_encoder_h264_test6_ov/" + film->dcp_name(false));
film2->examine_and_add_content (ov);
BOOST_REQUIRE (!wait_for_jobs());
@@ -334,7 +314,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 ();
}
@@ -342,12 +322,18 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
/** Test export of a 3D DCP in a 2D project */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264)
{
+ boost::filesystem::path const output = "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4";
+ Cleanup cl;
+ cl.add(output);
+
auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "xm");
- auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp});
+ auto film2 = new_test_film("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, output, ExportFormat::H264_AAC, true, false, false, 23);
encoder.go ();
+
+ cl.run();
}
@@ -356,7 +342,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
{
auto L = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
auto R = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
- auto film = new_test_film2 ("ffmpeg_encoder_h264_test7_data", {L, R});
+ auto film = new_test_film("ffmpeg_encoder_h264_test7_data", {L, R});
L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
L->set_position (film, DCPTime());
R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
@@ -365,10 +351,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
make_and_verify_dcp (film);
auto dcp = make_shared<DCPContent>(film->dir(film->dcp_name()));
- auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export", {dcp});
+ auto film2 = new_test_film("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 ();
}
@@ -376,11 +362,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
{
auto content = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
- auto film = new_test_film2("ffmpeg_encoder_2d_content_in_3d_project", { content });
+ auto film = new_test_film("ffmpeg_encoder_2d_content_in_3d_project", { content });
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();
}
@@ -388,13 +374,13 @@ BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
/** Stereo project with mixdown-to-stereo set */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
{
- auto film = new_test_film2("ffmpeg_encoder_h264_test4");
+ auto film = new_test_film("ffmpeg_encoder_h264_test4");
film->examine_and_add_content(make_shared<DCPContent>("test/data/scope_dcp"));
BOOST_REQUIRE(!wait_for_jobs());
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();
}
@@ -403,7 +389,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
{
auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
- auto film = new_test_film2("ffmpeg_encoder_prores_test9", { c });
+ auto film = new_test_film("ffmpeg_encoder_prores_test9", { c });
film->set_name ("ffmpeg_encoder_prores_test9");
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (12);
@@ -415,7 +401,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 ();
}
@@ -424,13 +410,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
{
auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
- auto film = new_test_film2 ("ffmpeg_encoder_prores_from_dcp_with_crop", { dcp });
+ auto film = new_test_film("ffmpeg_encoder_prores_from_dcp_with_crop", { dcp });
dcp->video->set_left_crop (32);
dcp->video->set_right_crop (32);
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 ();
}
@@ -439,13 +425,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop)
{
auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
- auto film = new_test_film2 ("ffmpeg_encoder_h264_from_dcp_with_crop", { dcp });
+ auto film = new_test_film("ffmpeg_encoder_h264_from_dcp_with_crop", { dcp });
dcp->video->set_left_crop (32);
dcp->video->set_right_crop (32);
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 ();
}
@@ -455,13 +441,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
{
auto content1 = content_factory("test/data/flat_red.png")[0];
auto content2 = content_factory("test/data/flat_red.png")[0];
- auto film = new_test_film2 ("ffmpeg_encoder_h264_with_reels", { content1, content2 });
+ auto film = new_test_film("ffmpeg_encoder_h264_with_reels", { content1, content2 });
film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
content1->video->set_length (240);
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) {
@@ -482,10 +468,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
Cleanup cl;
auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
- auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
+ auto film = new_test_film("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");
@@ -502,10 +488,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv")[0];
- auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
+ auto film = new_test_film("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);
@@ -518,13 +504,13 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
BOOST_AUTO_TEST_CASE(ffmpeg_encoder_missing_frame_at_end)
{
auto content = content_factory(TestPaths::private_data() / "1s1f.mov");
- auto film = new_test_film2("ffmpeg_encoder_missing_frame_at_end", content);
+ auto film = new_test_film("ffmpeg_encoder_missing_frame_at_end", content);
boost::filesystem::path output("build/test/ffmpeg_encoder_missing_frame_at_end.mov");
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");
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-27 12:55:36 +0000