From: Carl Hetherington <cth@carlh.net>
Date: Thu, 1 Mar 2018 23:40:18 +0000 (+0000)
Subject: Add some write_metadata() calls; use ImageContent for still image.
X-Git-Tag: v2.13.0~18
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2e60a7b24823b6b543f2920e0b5646fbce1ff6e7

Add some write_metadata() calls; use ImageContent for still image.
---

diff --git a/test/data b/test/data
index 22ba7b145..a6e0009c6 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 22ba7b14571926f6c3fd860df57ad2146d9ba404
+Subproject commit a6e0009c6e762d3bd27ebc6499b6e30fc4baea01
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index d958995ca..fc53ee40c 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -21,6 +21,7 @@
 #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"
@@ -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 ();