X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=dc57b473b48a3174ea080b8e2f3df545b680d260;hb=96f50dd5e600925488fdd9db1580aa01b026269b;hp=0881d2e2e1007b40dad31c069c64724231586d2b;hpb=da38c8a0156808595be0aae1b1490069a663fb78;p=dcpomatic.git

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 0881d2e2e..dc57b473b 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -24,6 +24,7 @@
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/content_factory.h"
+#include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
@@ -37,12 +38,14 @@
 #include "lib/transcode_job.h"
 #include "lib/video_content.h"
 #include "test.h"
+#include <dcp/file.h>
+#include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
 
 
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::string;
+using std::vector;
 using namespace dcpomatic;
 
 
@@ -370,6 +373,18 @@ 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 });
+	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);
+	encoder.go();
+}
+
+
 /** Stereo project with mixdown-to-stereo set */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 {
@@ -387,9 +402,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 /** 7.1/HI/VI (i.e. 12-channel) project */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test9");
-	film->set_name ("ffmpeg_encoder_prores_test9");
 	auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
+	auto film = new_test_film2("ffmpeg_encoder_prores_test9", { c });
+	film->set_name ("ffmpeg_encoder_prores_test9");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (12);
 
@@ -464,18 +479,25 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
 /** Regression test for "Error during decoding: Butler finished" (#2097) */
 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 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);
 	encoder.go ();
+
+	cl.add("build/test/ffmpeg_encoder_prores_regression_1.mov");
+	cl.run();
 }
 
 
 /** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 {
+	Cleanup cl;
+
 	auto logs = dcpomatic_log->types();
 	dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
 
@@ -487,5 +509,47 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 	encoder.go ();
 
 	dcpomatic_log->set_types(logs);
+
+	cl.add("build/test/ffmpeg_encoder_prores_regression_2.mov");
+	cl.run();
+}
+
+
+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);
+
+	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);
+	encoder.go();
+
+	run_ffprobe(output, log, false, "-show_frames -show_format -show_streams -select_streams v:0");
+
+	dcp::File read_log(log, "r");
+	BOOST_REQUIRE(read_log);
+
+	int nb_read_frames = 0;
+	int nb_frames = 0;
+	char buffer[256];
+
+	while (!read_log.eof()) {
+		read_log.gets(buffer, sizeof(buffer));
+		vector<string> parts;
+		boost::algorithm::split(parts, buffer, boost::is_any_of("="));
+		if (parts.size() == 2) {
+			if (parts[0] == "nb_read_frames") {
+				nb_read_frames = dcp::raw_convert<int>(parts[1]);
+			} else if (parts[0] == "nb_frames") {
+				nb_frames = dcp::raw_convert<int>(parts[1]);
+			}
+		}
+	}
+
+	BOOST_CHECK_EQUAL(nb_frames, 26);
+	BOOST_CHECK_EQUAL(nb_read_frames, 26);
 }