X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmake_black_test.cc;h=78c7fbbcba02f1222f4500c618fc5f67233d098b;hb=38fda7888663429d452b9c71902e8bb5239dd720;hp=c708709150405abd62027b63b2919c48f5037a77;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index c70870915..78c7fbbcb 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -17,6 +17,16 @@
 
 */
 
+#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().
 */
@@ -35,10 +45,13 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE);
 	pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE);
 	pix_fmts.push_back (AV_PIX_FMT_UYVY422);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ420P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ422P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ444P);
 
 	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);
 		
@@ -46,6 +59,9 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 		for (int y = 0; y < bar->size().height; ++y) {
 			uint8_t* q = p;
 			for (int x = 0; x < bar->line_size()[0]; ++x) {
+				if (*q != 0) {
+					std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n";
+				}
 				BOOST_CHECK_EQUAL (*q++, 0);
 			}
 			p += bar->stride()[0];