projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python mode line; try to fix centos build.
[dcpomatic.git]
/
test
/
skip_frame_test.cc
diff --git
a/test/skip_frame_test.cc
b/test/skip_frame_test.cc
index 61176a7c62a2dc34a0ffb02f1342a2b23b620619..dac7b5a25a7aa18ea79c52ec2c36e37d945b2f08 100644
(file)
--- a/
test/skip_frame_test.cc
+++ b/
test/skip_frame_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2015
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/skip_frame_test.cc
+ * @brief Test the skip of frames by the player when putting a 48fps
+ * source into a 24fps DCP.
+ *
+ * @see test/repeat_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 skip of frames by the player when putting a 48fps
- source into a 24fps DCP.
-*/
BOOST_AUTO_TEST_CASE (skip_frame_test)
{
shared_ptr<Film> film = new_test_film ("skip_frame_test");
BOOST_AUTO_TEST_CASE (skip_frame_test)
{
shared_ptr<Film> film = new_test_film ("skip_frame_test");
@@
-36,10
+40,11
@@
BOOST_AUTO_TEST_CASE (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_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"));
- c->set_scale (VideoContentScale (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->write_metadata ();
film->set_video_frame_rate (24);
film->write_metadata ();
film->set_video_frame_rate (24);