Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / make_black_test.cc

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 0ae2fd13713f3bb45d25fbd8c34dbf6f5e688735..b0243310bbacd2b9bfd9a23809195eab2763d212 100644 (file)
--- 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,12 +74,13 @@ 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, PIX_FMT_RGB24, true);
                
                uint8_t* p = bar->data()[0];
                for (int y = 0; y < bar->size().height; ++y) {