diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-25 16:19:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-25 16:19:53 +0100 |
| commit | 7b85b778834753912573fef7bb09d51821c0ef7c (patch) | |
| tree | 4705b413a7e5745bbb7cd1672219df2270353c8c | |
| parent | 6ddd8c036d2eccb189d57e3a0a5b0b611efebbcf (diff) | |
Support pixel format 46 in make_black().
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/image.cc | 1 | ||||
| -rw-r--r-- | test/make_black_test.cc | 7 |
3 files changed, 9 insertions, 3 deletions
@@ -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 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<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)); |