From 0b1f3a5dc3069726e61670b1aa35e62ba96ed198 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Jul 2013 17:17:37 +0100 Subject: [PATCH] Token 4K test. --- src/lib/player.cc | 2 +- test/4k_test.cc | 48 +++++++++++++++++++++++++++++++++++++++++++++++ test/test.h | 4 ++++ test/wscript | 1 + 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 test/4k_test.cc diff --git a/src/lib/player.cc b/src/lib/player.cc index ec20892ef..4ad930610 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -45,7 +45,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -#define DEBUG_PLAYER 1 +//#define DEBUG_PLAYER 1 class Piece { diff --git a/test/4k_test.cc b/test/4k_test.cc new file mode 100644 index 000000000..ee9ac0d98 --- /dev/null +++ b/test/4k_test.cc @@ -0,0 +1,48 @@ +/* + Copyright (C) 2013 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 + 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, + 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. + +*/ + +#include +#include "lib/film.h" +#include "lib/ffmpeg_content.h" +#include "lib/dcp_content_type.h" +#include "lib/ratio.h" +#include "test.h" + +using boost::shared_ptr; + +BOOST_AUTO_TEST_CASE (fourk_test) +{ + shared_ptr film = new_test_film ("4k_test"); + 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")); + film->set_container (Ratio::from_id ("185")); + film->examine_and_add_content (c); + wait_for_jobs (); + + film->make_dcp (); + wait_for_jobs (); + + boost::filesystem::path p (test_film_dir ("4k_test")); + p /= film->dcp_name (); + + check_dcp ("test/data/4k_test", p.string ()); +} diff --git a/test/test.h b/test/test.h index 6a6ba65ad..5c37f82d8 100644 --- a/test/test.h +++ b/test/test.h @@ -17,6 +17,10 @@ */ +#include + +class Film; + extern void wait_for_jobs (); extern boost::shared_ptr new_test_film (std::string); extern void check_dcp (std::string, std::string); diff --git a/test/wscript b/test/wscript index f4a7061d1..f0ee5f769 100644 --- a/test/wscript +++ b/test/wscript @@ -34,6 +34,7 @@ def build(bld): job_test.cc client_server_test.cc image_test.cc + 4k_test.cc """ obj.target = 'unit-tests' obj.install_path = '' -- 2.30.2