projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
test
/
repeat_frame_test.cc
diff --git
a/test/repeat_frame_test.cc
b/test/repeat_frame_test.cc
index 73b9ad615519d2a72fbfd9e934c1d2bd2b9d544a..1d19d269e314b2a448ab31dbbfcf73ceea9eaf1c 100644
(file)
--- a/
test/repeat_frame_test.cc
+++ b/
test/repeat_frame_test.cc
@@
-1,5
+1,5
@@
/*
/*
- 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
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
@@
-17,6
+17,13
@@
*/
*/
+/** @file test/repeat_frame_test.cc
+ * @brief Test the repeat of frames by the player when putting a 24fps
+ * source into a 48fps DCP.
+ *
+ * @see test/skip_frame_test.cc
+ */
+
#include <boost/test/unit_test.hpp>
#include "test.h"
#include "lib/film.h"
#include <boost/test/unit_test.hpp>
#include "test.h"
#include "lib/film.h"
@@
-26,9
+33,6
@@
using boost::shared_ptr;
using boost::shared_ptr;
-/* Test the repeat of frames by the player when putting a 24fps
- source into a 48fps DCP.
-*/
BOOST_AUTO_TEST_CASE (repeat_frame_test)
{
shared_ptr<Film> film = new_test_film ("repeat_frame_test");
BOOST_AUTO_TEST_CASE (repeat_frame_test)
{
shared_ptr<Film> film = new_test_film ("repeat_frame_test");
@@
-36,11
+40,12
@@
BOOST_AUTO_TEST_CASE (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_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"));
- c->set_ratio (Ratio::from_id ("185"));
film->examine_and_add_content (c);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
+ c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
film->set_video_frame_rate (48);
film->make_dcp ();
wait_for_jobs ();
film->set_video_frame_rate (48);
film->make_dcp ();
wait_for_jobs ();