Apply the remainder of a 1.x patch; a test.

[dcpomatic.git] / test / make_black_test.cc

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 88c1bd0f46d7f60c293b7a20d911e46ea1b8aa3f..f6c3a4bb2bbc87616ffc3cfbeb84a3ffacc07704 100644 (file)
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -17,6 +17,13 @@
 
 */
 
+/** @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 <dcp/util.h>
 extern "C" {
@@ -27,21 +34,18 @@ 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)
 {
        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_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);
@@ -71,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));