summaryrefslogtreecommitdiff
path: root/test/skip_frame_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-26 01:24:48 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-26 01:24:48 +0100
commitea63ad9560757e56505551db3bf2e1c31be5c76c (patch)
treeec0f539b89d9c8ac627e65886241cc086246ab09 /test/skip_frame_test.cc
parentcbb8260e395058da76b3de518ebc535a114c54b1 (diff)
More verification of DCPs during tests.
Diffstat (limited to 'test/skip_frame_test.cc')
-rw-r--r--test/skip_frame_test.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 928d173df..d096e50e5 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -18,6 +18,7 @@
*/
+
/** @file test/skip_frame_test.cc
* @brief Test the skip of frames by the player when putting a 48fps
* source into a 24fps DCP.
@@ -26,6 +27,7 @@
* @see test/repeat_frame_test.cc
*/
+
#include <boost/test/unit_test.hpp>
#include "test.h"
#include "lib/film.h"
@@ -34,16 +36,19 @@
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
+
using std::shared_ptr;
+using std::make_shared;
+
BOOST_AUTO_TEST_CASE (skip_frame_test)
{
- shared_ptr<Film> film = new_test_film ("skip_frame_test");
+ auto film = new_test_film ("skip_frame_test");
film->set_name ("skip_frame_test");
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
film->set_interop (false);
- shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/count300bd48.m2ts"));
+ auto c = make_shared<FFmpegContent>("test/data/count300bd48.m2ts");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
@@ -51,8 +56,7 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
film->write_metadata ();
film->set_video_frame_rate (24);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film);
/* Should be white numbers on a black background counting up from 2 in steps of 2
up to 300.