X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frepeat_frame_test.cc;h=4f66420ea4bedbeafd58439ca5d5f5d5987d453c;hb=233bb3f790aef3c8f9a7a7fde9875833b7dc1dfb;hp=73b9ad615519d2a72fbfd9e934c1d2bd2b9d544a;hpb=8353a009aae1a604251c0160193c39741c2fa27c;p=dcpomatic.git diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc index 73b9ad615..4f66420ea 100644 --- a/test/repeat_frame_test.cc +++ b/test/repeat_frame_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington 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 #include "test.h" #include "lib/film.h" @@ -26,9 +33,6 @@ 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 = new_test_film ("repeat_frame_test"); @@ -36,7 +40,7 @@ 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 c (new FFmpegContent (film, "test/data/red_24.mp4")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (c); wait_for_jobs ();