X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=9e80a6e27bb035c25e940fd8dccf3d9b060a57fc;hb=HEAD;hp=ee9ac0d9817c6f2fd7e19fca65d3bccf9f92c0b0;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/test/4k_test.cc b/test/4k_test.cc index ee9ac0d98..9e80a6e27 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -1,48 +1,72 @@ /* - Copyright (C) 2013 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 . */ -#include -#include "lib/film.h" -#include "lib/ffmpeg_content.h" + +/** @defgroup completedcp Complete builds of DCPs */ + +/** @file test/4k_test.cc + * @brief Run a 4K encode from a simple input. + * @ingroup completedcp + * + * The output is checked against test/data/4k_test. + */ + + #include "lib/dcp_content_type.h" +#include "lib/dcpomatic_log.h" +#include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/ratio.h" +#include "lib/video_content.h" #include "test.h" +#include + + +using std::make_shared; -using boost::shared_ptr; BOOST_AUTO_TEST_CASE (fourk_test) { - shared_ptr film = new_test_film ("4k_test"); + auto film = new_test_film ("4k_test"); + LogSwitcher ls (film->log()); film->set_name ("4k_test"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_ratio (Ratio::from_id ("185")); - film->set_resolution (RESOLUTION_4K); - film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); + auto c = make_shared("test/data/test.mp4"); + film->set_resolution (Resolution::FOUR_K); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - wait_for_jobs (); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE, + dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE + }); - boost::filesystem::path p (test_film_dir ("4k_test")); + boost::filesystem::path p (test_film_dir("4k_test")); p /= film->dcp_name (); - check_dcp ("test/data/4k_test", p.string ()); + /* This test is concerned with the image and its metadata, so we'll + * ignore any differences in sound between the DCP and the reference to + * avoid test failures for unrelated reasons. + */ + check_dcp("test/data/4k_test", p.string(), true); }