X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frepeat_frame_test.cc;h=b43312e59bbbc9c208eea3d97107b2071ed3296a;hp=4f66420ea4bedbeafd58439ca5d5f5d5987d453c;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=1c13441a19aa387ddd8ac0c972207ccbbe3114d8 diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc index 4f66420ea..b43312e59 100644 --- a/test/repeat_frame_test.cc +++ b/test/repeat_frame_test.cc @@ -1,54 +1,56 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington - 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. - 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 - 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 . */ + /** @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 */ + #include #include "test.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" +#include "lib/video_content.h" + + +using std::make_shared; +using std::shared_ptr; -using boost::shared_ptr; BOOST_AUTO_TEST_CASE (repeat_frame_test) { - shared_ptr 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 c (new FFmpegContent (film, "test/data/red_24.mp4")); - c->set_scale (VideoContentScale (Ratio::from_id ("185"))); - film->examine_and_add_content (c); - - wait_for_jobs (); + auto c = make_shared("test/data/red_24.mp4"); + auto film = new_test_film2 ("repeat_frame_test", {c}); + film->set_interop (false); + c->video->set_custom_ratio (1.85); film->set_video_frame_rate (48); - film->make_dcp (); - wait_for_jobs (); + make_and_verify_dcp (film); + /* 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 ())); } -