Merge master.

[dcpomatic.git] / test / make_black_test.cc

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 17c78d23110013c8202d002c30588781256569e0..88c1bd0f46d7f60c293b7a20d911e46ea1b8aa3f 100644 (file)
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -32,12 +32,17 @@ using std::list;
 */
 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);
@@ -48,6 +53,24 @@ 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) {