/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-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
*/
-#include "imagemagick_content.h"
+#include <boost/test/unit_test.hpp>
+#include "lib/image_content.h"
+#include "lib/dcp_content_type.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "test.h"
/** @file test/black_fill_test.cc
- * @brief Test insertion of black frames between video content.
+ * @brief Test insertion of black frames between separate bits of video content.
*/
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (black_fill_test)
{
shared_ptr<Film> film = new_test_film ("black_fill_test");
- film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
film->set_name ("black_fill_test");
film->set_container (Ratio::from_id ("185"));
film->set_sequence_video (false);
- shared_ptr<ImageMagickContent> contentA (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
- contentA->set_ratio (Ratio::from_id ("185"));
- shared_ptr<ImageMagickContent> contentB (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
- contentB->set_ratio (Ratio::from_id ("185"));
+ shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+ contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+ contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (contentA);
film->examine_and_add_content (contentB);
- while (JobManager::instance()->work_to_do ()) {}
+ wait_for_jobs ();
- contentA->set_video_length (3);
- contentA->set_start (film->video_frames_to_time (2));
- contentB->set_video_length (1);
- contentB->set_start (film->video_frames_to_time (7));
+ contentA->set_video_length (ContentTime::from_frames (3, 24));
+ contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+ contentB->set_video_length (ContentTime::from_frames (1, 24));
+ contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
film->make_dcp ();
- while (JobManager::instance()->work_to_do ()) {}
-
- BOOST_CHECK (!JobManager::instance()->errors());
+ wait_for_jobs ();
boost::filesystem::path ref;
ref = "test";