Token 4K test.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index ec20892effe9ec571d89e3c6cbb33bb2a68c70cd..4ad93061053e1bb6b0a2bf722d30a3b9bcd8e1a3 100644 (file)
--- 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 (file)
index 0000000..ee9ac0d
--- /dev/null
+++ b/test/4k_test.cc
@@ -0,0 +1,48 @@
+/*
+    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+
+    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 <boost/test/unit_test.hpp>
+#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> film = new_test_film ("4k_test");
+       film->set_name ("4k_test");
+       shared_ptr<FFmpegContent> 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 6a6ba65ad9dc6fe39d1d7abb1e984142f01c3c86..5c37f82d8e2987583b3944247bfb1bd9bb7b3060 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -17,6 +17,10 @@
 
 */
 
+#include <boost/filesystem.hpp>
+
+class Film;
+
 extern void wait_for_jobs ();
 extern boost::shared_ptr<Film> new_test_film (std::string);
 extern void check_dcp (std::string, std::string);

diff --git a/test/wscript b/test/wscript
index f4a7061d1d7c8cd784c0551632420d0f37cd56e4..f0ee5f7693a5a3742cf76b4a5e4a18cb6b5f7f25 100644 (file)
--- 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 = ''