projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a38bc6d
)
Another slightly speculative pixel format addition.
author
Carl Hetherington
<cth@carlh.net>
Thu, 18 Oct 2012 11:24:48 +0000
(12:24 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 18 Oct 2012 11:24:48 +0000
(12:24 +0100)
src/lib/image.cc
patch
|
blob
|
history
diff --git
a/src/lib/image.cc
b/src/lib/image.cc
index 4952e4557d34c50fcd1f8959af8a96d663764912..b2024e0e95ad5ebd197ad719a883eee73b13ea30 100644
(file)
--- a/
src/lib/image.cc
+++ b/
src/lib/image.cc
@@
-60,6
+60,7
@@
Image::lines (int n) const
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
case PIX_FMT_YUV422P10LE:
+ case PIX_FMT_YUV422P:
return size().height;
default:
assert (false);
return size().height;
default:
assert (false);
@@
-75,6
+76,7
@@
Image::components () const
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
+ case PIX_FMT_YUV422P:
return 3;
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
return 3;
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
@@
-181,6
+183,7
@@
Image::post_process (string pp) const
pp_format = PP_FORMAT_420;
break;
case PIX_FMT_YUV422P10LE:
pp_format = PP_FORMAT_420;
break;
case PIX_FMT_YUV422P10LE:
+ case PIX_FMT_YUV422P:
pp_format = PP_FORMAT_422;
break;
default:
pp_format = PP_FORMAT_422;
break;
default:
@@
-209,6
+212,7
@@
Image::make_black ()
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
+ case PIX_FMT_YUV422P:
memset (data()[0], 0, lines(0) * stride()[0]);
memset (data()[1], 0x80, lines(1) * stride()[1]);
memset (data()[2], 0x80, lines(2) * stride()[2]);
memset (data()[0], 0, lines(0) * stride()[0]);
memset (data()[1], 0x80, lines(1) * stride()[1]);
memset (data()[2], 0x80, lines(2) * stride()[2]);
@@
-310,6
+314,7
@@
SimpleImage::SimpleImage (PixelFormat p, Size s, function<int (int)> rounder)
_line_size[0] = s.width * 4;
break;
case PIX_FMT_YUV420P:
_line_size[0] = s.width * 4;
break;
case PIX_FMT_YUV420P:
+ case PIX_FMT_YUV422P:
_line_size[0] = s.width;
_line_size[1] = s.width / 2;
_line_size[2] = s.width / 2;
_line_size[0] = s.width;
_line_size[1] = s.width / 2;
_line_size[2] = s.width / 2;