X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=a77d8459bb317252ae1bba9295c8824f6d87e298;hb=525eb7112ae14d0fa600dd3b21af875fa3759038;hp=4ac5192f23284d375353adb6c6487cbd4fa02504;hpb=d2926ea8574330b9c7f4efa4241843cf052652b8;p=dcpomatic.git diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc index 4ac5192f2..a77d8459b 100644 --- a/test/skip_frame_test.cc +++ b/test/skip_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/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 #include "test.h" #include "lib/film.h" @@ -26,9 +33,6 @@ 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 = new_test_film ("skip_frame_test"); @@ -36,7 +40,7 @@ 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 c (new FFmpegContent (film, "test/data/count300bd48.m2ts")); - c->set_ratio (Ratio::from_id ("185")); + c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->examine_and_add_content (c); wait_for_jobs ();