Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

[dcpomatic.git] / test / ffmpeg_dcp_test.cc

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 4922ec4d4d99f4c6d523ffc9175bf32ece02caee..8b441db98578f7573ba6845298c29a869ea4915b 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,12 @@
 
 */
 
+/** @file test/ffmpeg_dcp_test.cc
+ *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *
+ *  Also a quick test of Film::have_dcp ().
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include "lib/film.h"
@@ -27,20 +33,17 @@
 
 using boost::shared_ptr;
 
-/** @file test/ffmpeg_dcp_test.cc
- *  @brief Test scaling and black-padding of images from a still-image source.
- */
-
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
        shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
        film->set_name ("test_film2");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
-       film->examine_and_add_content (c);
+       film->examine_and_add_content (c, true);
 
        wait_for_jobs ();
        
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+       
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();