projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
test
/
make_black_test.cc
diff --git
a/test/make_black_test.cc
b/test/make_black_test.cc
index 2960a596fc42c60864481612846c58dbfbf0c820..88c1bd0f46d7f60c293b7a20d911e46ea1b8aa3f 100644
(file)
--- a/
test/make_black_test.cc
+++ b/
test/make_black_test.cc
@@
-18,7
+18,7
@@
*/
#include <boost/test/unit_test.hpp>
*/
#include <boost/test/unit_test.hpp>
-#include <
lib
dcp/util.h>
+#include <dcp/util.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
extern "C" {
#include <libavutil/pixfmt.h>
}
@@
-32,12
+32,17
@@
using std::list;
*/
BOOST_AUTO_TEST_CASE (make_black_test)
{
*/
BOOST_AUTO_TEST_CASE (make_black_test)
{
-
lib
dcp::Size in_size (512, 512);
-
lib
dcp::Size out_size (1024, 1024);
+ dcp::Size in_size (512, 512);
+ dcp::Size out_size (1024, 1024);
list<AVPixelFormat> pix_fmts;
pix_fmts.push_back (AV_PIX_FMT_RGB24);
list<AVPixelFormat> pix_fmts;
pix_fmts.push_back (AV_PIX_FMT_RGB24);
+ 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);
+ pix_fmts.push_back (AV_PIX_FMT_YUV411P);
pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);