/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/image_content.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content.h"
+#include "lib/video_content.h"
+#include "lib/text_subtitle_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
using std::list;
using boost::shared_ptr;
shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_red.png"));
film->examine_and_add_content (c);
wait_for_jobs ();
- c->set_video_length (24);
+ c->video->set_length (24);
}
{
shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_green.png"));
film->examine_and_add_content (c);
wait_for_jobs ();
- c->set_video_length (24);
+ c->video->set_length (24);
}
{
shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_blue.png"));
film->examine_and_add_content (c);
wait_for_jobs ();
- c->set_video_length (24);
+ c->video->set_length (24);
}
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
check_dcp ("test/data/reels_test2", film->dir (film->dcp_name()));
- shared_ptr<Film> film2 = new_test_film ("reels_test3");
- film2->set_name ("reels_test3");
+ shared_ptr<Film> film2 = new_test_film ("reels_test2b");
+ film2->set_name ("reels_test2b");
film2->set_container (Ratio::from_id ("185"));
film2->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
film2->make_dcp ();
wait_for_jobs ();
}
+
+/** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end
+ * of all the video content to mop up anything afterward.
+ */
+BOOST_AUTO_TEST_CASE (reels_test3)
+{
+ shared_ptr<Film> film = new_test_film ("reels_test3");
+ film->set_name ("reels_test3");
+ film->set_container (Ratio::from_id ("185"));
+ film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+
+ shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
+ film->examine_and_add_content (dcp);
+ shared_ptr<Content> sub (new TextSubtitleContent (film, "test/data/subrip.srt"));
+ film->examine_and_add_content (sub);
+ wait_for_jobs ();
+
+ list<DCPTimePeriod> reels = film->reels();
+ BOOST_REQUIRE_EQUAL (reels.size(), 4);
+ list<DCPTimePeriod>::const_iterator i = reels.begin ();
+ BOOST_CHECK_EQUAL (i->from, DCPTime (0));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3));
+ BOOST_CHECK_EQUAL (i->to, sub->full_length().round_up (film->video_frame_rate()));
+}
+
+/** Check creation of a multi-reel DCP with a single .srt subtitle file;
+ * make sure that the reel subtitle timing is done right.
+ */
+BOOST_AUTO_TEST_CASE (reels_test4)
+{
+ shared_ptr<Film> film = new_test_film ("reels_test4");
+ film->set_name ("reels_test4");
+ film->set_container (Ratio::from_id ("185"));
+ film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+
+ /* 4 piece of 1s-long content */
+ shared_ptr<ImageContent> content[4];
+ for (int i = 0; i < 4; ++i) {
+ content[i].reset (new ImageContent (film, "test/data/flat_green.png"));
+ film->examine_and_add_content (content[i]);
+ wait_for_jobs ();
+ content[i]->video->set_length (24);
+ }
+
+ shared_ptr<TextSubtitleContent> subs (new TextSubtitleContent (film, "test/data/subrip3.srt"));
+ film->examine_and_add_content (subs);
+ wait_for_jobs ();
+
+ list<DCPTimePeriod> reels = film->reels();
+ BOOST_REQUIRE_EQUAL (reels.size(), 4);
+ list<DCPTimePeriod>::const_iterator i = reels.begin ();
+ BOOST_CHECK_EQUAL (i->from, DCPTime (0));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3));
+ ++i;
+ BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3));
+ BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4));
+
+ film->make_dcp ();
+ wait_for_jobs ();
+
+ check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
+}
projects / dcpomatic.git / blobdiff