X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=d1d07e28c6f97e17e6c01befe4fc2cb4910b6069;hp=d958995ca2628d71fb7f98d769c2963b4ac4cb6d;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=a249eedcaf39c72b710f7edb65140c30f958f5ff

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index d958995ca..d1d07e28c 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -21,13 +21,14 @@
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/image_content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/string_text_file_content.h"
 #include "lib/ratio.h"
 #include "lib/transcode_job.h"
 #include "lib/dcp_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/compose.hpp"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -62,6 +63,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, FFmpegEncoder:
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
+	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
 	FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false);
 	encoder.go ();
@@ -96,7 +98,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test5");
 	film->set_name ("ffmpeg_encoder_prores_test5");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "bbc405.png"));
+	shared_ptr<ImageContent> c (new ImageContent (film, private_data / "bbc405.png"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
@@ -105,6 +107,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 
 	c->video->set_length (240);
 
+	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", FFmpegEncoder::FORMAT_PRORES, false);
 	encoder.go ();
@@ -118,12 +121,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
-	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringTextFileContent> s (new StringTextFileContent (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));
+	s->only_caption()->set_colour (dcp::Colour (255, 255, 0));
+	s->only_caption()->set_effect (dcp::SHADOW);
+	s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
@@ -143,12 +146,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFileContent> s (new StringTextFileContent (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));
+	s->only_caption()->set_colour (dcp::Colour (255, 255, 0));
+	s->only_caption()->set_effect (dcp::SHADOW);
+	s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	shared_ptr<Job> job (new TranscodeJob (film));
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", FFmpegEncoder::FORMAT_PRORES, false);
@@ -169,12 +172,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
-	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringTextFileContent> s (new StringTextFileContent (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));
+	s->only_caption()->set_colour (dcp::Colour (255, 255, 0));
+	s->only_caption()->set_effect (dcp::SHADOW);
+	s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
@@ -194,12 +197,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFileContent> s (new StringTextFileContent (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));
+	s->only_caption()->set_colour (dcp::Colour (255, 255, 0));
+	s->only_caption()->set_effect (dcp::SHADOW);
+	s->only_caption()->set_effect_colour (dcp::Colour (0, 255, 255));
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));