From: Carl Hetherington Date: Wed, 25 Jun 2014 15:19:53 +0000 (+0100) Subject: Support pixel format 46 in make_black(). X-Git-Tag: v2.0.48~551^2~41 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7b85b778834753912573fef7bb09d51821c0ef7c Support pixel format 46 in make_black(). --- diff --git a/ChangeLog b/ChangeLog index 0e7ecd836..ad48437c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-25 Carl Hetherington + + * Support pixel format 46 in make_black(). + 2014-06-24 Carl Hetherington * Re-assign timeline tracks when things are diff --git a/src/lib/image.cc b/src/lib/image.cc index 8a8fb1c7b..f340637dc 100644 --- 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 7c0f92142..dd0208b1d 100644 --- 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 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::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { boost::shared_ptr foo (new Image (*i, in_size, true));