X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=393d09117a29bdd094887730ce44416d30c52342;hb=08d7c68c863ce38f6bdd89f36cf580119c6bd7fc;hp=4af823852cd0226243bb58dc19ff8b72baa574ad;hpb=7d651ec877927e0887da48ce441e5c5158e1f34f;p=dcpomatic.git

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 4af823852..393d09117 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,10 +21,13 @@
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include "lib/text_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/transcode_job.h"
+#include "lib/dcp_content.h"
+#include "lib/subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -32,8 +35,8 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mov)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_mov");
-	film->set_name ("ffmpeg_transcoder_basic_test");
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_basic_test_mov");
+	film->set_name ("ffmpeg_encoder_basic_test_mov");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
@@ -46,6 +49,22 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mov)
 	encoder.go ();
 }
 
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test2_mov)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_basic_test2_mov");
+	film->set_name ("ffmpeg_encoder_basic_test2_mov");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "dolby_aurora.vob"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+
+	film->examine_and_add_content (c);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test2.mov", FFmpegEncoder::FORMAT_PRORES, false);
+	encoder.go ();
+}
+
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mp4)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_mp4");
@@ -62,10 +81,78 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mp4)
 	encoder.go ();
 }
 
-BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_subs)
+/** Simplest possible export subtitle case: just the subtitles */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_h264_1)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_subs");
-	film->set_name ("ffmpeg_transcoder_basic_test");
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_test_subs_h264_1");
+	film->set_name ("ffmpeg_encoder_test_subs_h264_1");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+
+	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+	film->examine_and_add_content (s);
+	BOOST_REQUIRE (!wait_for_jobs ());
+	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
+	s->subtitle->set_effect (dcp::SHADOW);
+	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	film->write_metadata();
+
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_test_subs_h264_1.mp4", FFmpegEncoder::FORMAT_H264, false);
+	encoder.go ();
+}
+
+/** Slightly more complicated example with longer subs and a video to overlay */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_h264_2)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_test_subs_h264_2");
+	film->set_name ("ffmpeg_encoder_test_subs_h264_2");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	film->examine_and_add_content (c);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
+	film->examine_and_add_content (s);
+	BOOST_REQUIRE (!wait_for_jobs ());
+	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
+	s->subtitle->set_effect (dcp::SHADOW);
+	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	film->write_metadata();
+
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_test_subs_h264_2.mp4", FFmpegEncoder::FORMAT_H264, false);
+	encoder.go ();
+}
+
+/** Simplest possible export subtitle case: just the subtitles */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_prores_1)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_test_subs_prores_1");
+	film->set_name ("ffmpeg_encoder_test_subs_prores_1");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+
+	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+	film->examine_and_add_content (s);
+	BOOST_REQUIRE (!wait_for_jobs ());
+	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
+	s->subtitle->set_effect (dcp::SHADOW);
+	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
+	film->write_metadata();
+
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_test_subs_prores_1.mov", FFmpegEncoder::FORMAT_PRORES, false);
+	encoder.go ();
+}
+
+/** Slightly more complicated example with longer subs and a video to overlay */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_prores_2)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_test_subs_prores_2");
+	film->set_name ("ffmpeg_encoder_test_subs_prores_2");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
@@ -76,12 +163,29 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_subs)
 	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
+	s->subtitle->set_colour (dcp::Colour (255, 255, 0));
+	s->subtitle->set_effect (dcp::SHADOW);
+	s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test_subs.mp4", FFmpegEncoder::FORMAT_H264, false);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_test_subs_prores_2.mov", FFmpegEncoder::FORMAT_PRORES, false);
 	encoder.go ();
 }
 
+/** Test a bug with export of scope-in-flat DCP content */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_bug_test_scope)
+{
+	shared_ptr<Film> film = new_test_film2("ffmpeg_encoder_bug_test_scope");
+	film->examine_and_add_content(shared_ptr<DCPContent>(new DCPContent(film, "test/data/scope_dcp")));
+	BOOST_REQUIRE(!wait_for_jobs());
+
+	film->set_container(Ratio::from_id("185"));
+
+	shared_ptr<Job> job(new TranscodeJob(film));
+	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_bug_test_scope.mp4", FFmpegEncoder::FORMAT_H264, false);
+	encoder.go();
+}
+
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mixdown)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_mixdown");
@@ -134,8 +238,24 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mixdown)
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test_mixdown.mp4", FFmpegEncoder::FORMAT_H264, true);
 	encoder.go ();
 
-	/* Skip the first video packet when checking as it contains x264 options which can vary between machines
-	   (e.g. number of threads used for encoding).
-	*/
-	check_ffmpeg ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4", 0);
+	check_ffmpeg ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4", 1);
+}
+
+/** Test going from an image source to a MOV which has at times had big colour problems */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_image_test_mov)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_image_test_mov");
+	film->set_name ("ffmpeg_encoder_image_test");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "bbc405.png"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (6);
+
+	film->examine_and_add_content (c);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	c->video->set_length (240);
+
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_image_test.mov", FFmpegEncoder::FORMAT_PRORES, false);
+	encoder.go ();
 }