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

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 9bec00651..8507f5891 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -17,17 +17,32 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include <libdcp/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)
 {
-	libdcp::Size in_size (512, 512);
-	libdcp::Size out_size (1024, 1024);
+	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_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_YUV411P);
 	pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
@@ -38,12 +53,30 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	pix_fmts.push_back (AV_PIX_FMT_YUVJ420P);
 	pix_fmts.push_back (AV_PIX_FMT_YUVJ422P);
 	pix_fmts.push_back (AV_PIX_FMT_YUVJ444P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE);
 
 	int N = 0;
 	for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
-		boost::shared_ptr<Image> foo (new SimpleImage (*i, in_size, true));
+		boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
 		foo->make_black ();
-		boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, Scaler::from_id ("bicubic"), true);
+		boost::shared_ptr<Image> bar = foo->scale (out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
 		
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {