projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
test
/
repeat_frame_test.cc
diff --git
a/test/repeat_frame_test.cc
b/test/repeat_frame_test.cc
index cba5e0582da30a7c314b3ae8b6aa7269d18ed678..fbbaba3f152c7158e71940d43d31dcc1a5a4b785 100644
(file)
--- a/
test/repeat_frame_test.cc
+++ b/
test/repeat_frame_test.cc
@@
-1,25
+1,27
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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.
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/repeat_frame_test.cc
* @brief Test the repeat of frames by the player when putting a 24fps
* source into a 48fps DCP.
*/
/** @file test/repeat_frame_test.cc
* @brief Test the repeat of frames by the player when putting a 24fps
* source into a 48fps DCP.
+ * @ingroup feature
*
* @see test/skip_frame_test.cc
*/
*
* @see test/skip_frame_test.cc
*/
@@
-32,25
+34,24
@@
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
BOOST_AUTO_TEST_CASE (repeat_frame_test)
{
shared_ptr<Film> film = new_test_film ("repeat_frame_test");
film->set_name ("repeat_frame_test");
film->set_container (Ratio::from_id ("185"));
BOOST_AUTO_TEST_CASE (repeat_frame_test)
{
shared_ptr<Film> film = new_test_film ("repeat_frame_test");
film->set_name ("repeat_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/red_24.mp4"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+ film->set_interop (false);
+ shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
film->examine_and_add_content (c);
film->examine_and_add_content (c);
-
- wait_for_jobs ();
-
- c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ BOOST_REQUIRE (!wait_for_jobs());
+ c->video->set_custom_ratio (1.85);
film->set_video_frame_rate (48);
film->make_dcp ();
film->set_video_frame_rate (48);
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- /* Should be 32 frames of red */
+ /* Should be 32 frames of red
followed by 16 frames of black to fill the DCP up to 1 second
*/
check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
}
check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
}