projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't throw an error when the Butler says it is finished (#2097).
[dcpomatic.git]
/
test
/
skip_frame_test.cc
diff --git
a/test/skip_frame_test.cc
b/test/skip_frame_test.cc
index da3997fc7198602b790350129891c7bddc7fb411..d096e50e505f65783c7ebf1ee083c45f42d7fe9b 100644
(file)
--- a/
test/skip_frame_test.cc
+++ b/
test/skip_frame_test.cc
@@
-1,59
+1,65
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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.
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
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/>.
*/
*/
+
/** @file test/skip_frame_test.cc
* @brief Test the skip of frames by the player when putting a 48fps
* source into a 24fps DCP.
/** @file test/skip_frame_test.cc
* @brief Test the skip of frames by the player when putting a 48fps
* source into a 24fps DCP.
+ * @ingroup feature
*
* @see test/repeat_frame_test.cc
*/
*
* @see test/repeat_frame_test.cc
*/
+
#include <boost/test/unit_test.hpp>
#include "test.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content_type.h"
#include <boost/test/unit_test.hpp>
#include "test.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
+
+
+using std::shared_ptr;
+using std::make_shared;
-using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (skip_frame_test)
{
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_name ("skip_frame_test");
film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
- shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+ film->set_interop (false);
+ auto c = make_shared<FFmpegContent>("test/data/count300bd48.m2ts");
film->examine_and_add_content (c);
film->examine_and_add_content (c);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- c->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->write_metadata ();
film->set_video_frame_rate (24);
film->write_metadata ();
film->set_video_frame_rate (24);
- film->make_dcp ();
- 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.
*/
check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
}
/* Should be white numbers on a black background counting up from 2 in steps of 2
up to 300.
*/
check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
}
-