Support pixel format 46 in make_black().

diff --git a/ChangeLog b/ChangeLog
index 0e7ecd836e4d4679ad955fb212d8bc71c07077d6..ad48437c1aa7305fad154015d6ed2d105f89460a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-25  Carl Hetherington  <cth@carlh.net>
+
+       * Support pixel format 46 in make_black().
+
 2014-06-24  Carl Hetherington  <cth@carlh.net>
 
        * Re-assign timeline tracks when things are

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 8a8fb1c7b2d5cfe94f73e8e739d0cd738fd9abdb..f340637dc7ebf2d515983fe6921de162045e9afa 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -319,6 +319,7 @@ Image::make_black ()
        case PIX_FMT_RGBA:
        case PIX_FMT_ABGR:
        case PIX_FMT_BGRA:
+       case PIX_FMT_RGB555LE:
                memset (data()[0], 0, lines(0) * stride()[0]);
                break;
 

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 7c0f92142b0f2f9faf4e68c58d66fc89b79b7e38..dd0208b1d1dd7379a82ee945c53ff5b573dd54c2 100644 (file)
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -36,12 +36,12 @@ BOOST_AUTO_TEST_CASE (make_black_test)
        libdcp::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 +71,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));