X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmake_black_test.cc;h=f6c3a4bb2bbc87616ffc3cfbeb84a3ffacc07704;hb=937b96045830a2326daff83b70b892f2d25244ff;hp=2960a596fc42c60864481612846c58dbfbf0c820;hpb=089b90439e745a218494e76b45e7df6215af01df;p=dcpomatic.git

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 2960a596f..f6c3a4bb2 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -17,8 +17,15 @@
 
 */
 
+/** @file  test/make_black_test.cc
+ *  @brief Check that Image::make_black works, and doesn't use values which crash
+ *  sws_scale().
+ *
+ *  @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>
 }
@@ -27,17 +34,19 @@ extern "C" {
 
 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_YUV420P);
+	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); // 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);
 	pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
@@ -66,7 +75,8 @@ 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));