X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmake_black_test.cc;h=c402884b377cf67a2acf286beb433b6345f9743e;hb=0aa823f1a0a418a5345af1907effaab51e225274;hp=0ae2fd13713f3bb45d25fbd8c34dbf6f5e688735;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 0ae2fd137..c402884b3 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -30,7 +30,6 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include "lib/image.h"
-#include "lib/scaler.h"
 
 using std::list;
 
@@ -40,12 +39,12 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	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);
@@ -75,13 +74,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;