X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fmake_black_test.cc;h=2ed5db8eff55c91286e7045fde006460328bae39;hp=8507f58916c3deb0131c260b88bc7b4919be4f05;hb=5f3a88d3ab1e9c1a13d7e61fc37a0c4cef8df9a5;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 8507f5891..2ed5db8ef 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -1,47 +1,51 @@
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  test/make_black_test.cc
+ *  @brief Check that Image::make_black works and doesn't use values which crash
+ *  sws_scale().
+ *  @ingroup selfcontained
+ *  @see test/image_test.cc
+ */
+
 #include <boost/test/unit_test.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include "lib/image.h"
-#include "lib/scaler.h"
 
 using std::list;
 
-/* Check that Image::make_black works, and doesn't use values which crash
-   sws_scale().
-*/
 BOOST_AUTO_TEST_CASE (make_black_test)
 {
 	dcp::Size in_size (512, 512);
 	dcp::Size out_size (1024, 1024);
 
 	list<AVPixelFormat> pix_fmts;
-	pix_fmts.push_back (AV_PIX_FMT_RGB24);
+	pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2
 	pix_fmts.push_back (AV_PIX_FMT_ARGB);
 	pix_fmts.push_back (AV_PIX_FMT_RGBA);
 	pix_fmts.push_back (AV_PIX_FMT_ABGR);
 	pix_fmts.push_back (AV_PIX_FMT_BGRA);
-	pix_fmts.push_back (AV_PIX_FMT_YUV420P);
+	pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0
 	pix_fmts.push_back (AV_PIX_FMT_YUV411P);
 	pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
@@ -71,13 +75,14 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE);
+	pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46
 
 	int N = 0;
 	for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
 		boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
 		foo->make_black ();
-		boost::shared_ptr<Image> bar = foo->scale (out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
-		
+		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
+
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {
 			uint8_t* q = p;