Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / test / ffmpeg_encoder_test.cc

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index c13e991b05aaed3c548ac036e9abaffc45c331e3..df64a2c486dce626c95006206753b48b427f30a3 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -25,6 +25,8 @@
 #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>
 
@@ -62,10 +64,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 +146,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,5 +221,8 @@ 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 ();
 
-       check_file ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4");
+       /* 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");
 }