Add pixel format 0 (AV_PIX_FMT_YUV420P) to make_part_black().

[dcpomatic.git] / src / lib / image.cc

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 49acdb5c2cd7ba0a5a17376109f4f1d1e8092f64..c82db59eef8db72006f502cea634b25c89f796c1 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -59,6 +59,15 @@ using dcp::Size;
 /** The memory alignment, in bytes, used for each row of an image if aligment is requested */
 #define ALIGNMENT 64
 
+/* U/V black value for 8-bit colour */
+static uint8_t const eight_bit_uv =    (1 << 7) - 1;
+/* U/V black value for 9-bit colour */
+static uint16_t const nine_bit_uv =    (1 << 8) - 1;
+/* U/V black value for 10-bit colour */
+static uint16_t const ten_bit_uv =     (1 << 9) - 1;
+/* U/V black value for 16-bit colour */
+static uint16_t const sixteen_bit_uv = (1 << 15) - 1;
+
 
 int
 Image::vertical_factor (int n) const
@@ -376,8 +385,25 @@ Image::swap_16 (uint16_t v)
        return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
 }
 
+
+/* This was a lambda in the original code */
+static
+void
+y_part (Image* image, int start, int width)
+{
+       int const bpp = image->bytes_per_pixel(0);
+       int const h = image->sample_size(0).height;
+       int const s = image->stride()[0];
+       uint8_t* p = image->data()[0];
+       for (int y = 0; y < h; ++y) {
+               memset (p + start * bpp, 0, width * bpp);
+               p += s;
+       }
+}
+
+
 void
-Image::make_part_black (int x, int w)
+Image::make_part_black (int const start, int const width)
 {
        switch (_pixel_format) {
        case AV_PIX_FMT_RGB24:
@@ -395,12 +421,41 @@ Image::make_part_black (int x, int w)
                int const s = stride()[0];
                uint8_t* p = data()[0];
                for (int y = 0; y < h; y++) {
-                       memset (p + x * bpp, 0, w * bpp);
+                       memset (p + start * bpp, 0, width * bpp);
                        p += s;
                }
                break;
        }
-
+       case AV_PIX_FMT_YUV420P:
+       {
+               y_part (this, start, width);
+               for (int i = 1; i < 3; ++i) {
+                       uint8_t* p = data()[i];
+                       int const h = sample_size(i).height;
+                       for (int y = 0; y < h; ++y) {
+                               for (int x = start / 2; x < (start + width) / 2; ++x) {
+                                       p[x] = eight_bit_uv;
+                               }
+                               p += stride()[i];
+                       }
+               }
+               break;
+       }
+       case AV_PIX_FMT_YUV422P10LE:
+       {
+               y_part (this, start, width);
+               for (int i = 1; i < 3; ++i) {
+                       int16_t* p = reinterpret_cast<int16_t*>(data()[i]);
+                       int const h = sample_size(i).height;
+                       for (int y = 0; y < h; ++y) {
+                               for (int x = start / 2; x < (start + width) / 2; ++x) {
+                                       p[x] = ten_bit_uv;
+                               }
+                               p += stride()[i] / 2;
+                       }
+               }
+               break;
+       }
        default:
                throw PixelFormatError ("make_part_black()", _pixel_format);
        }
@@ -409,15 +464,6 @@ Image::make_part_black (int x, int w)
 void
 Image::make_black ()
 {
-       /* U/V black value for 8-bit colour */
-       static uint8_t const eight_bit_uv =     (1 << 7) - 1;
-       /* U/V black value for 9-bit colour */
-       static uint16_t const nine_bit_uv =     (1 << 8) - 1;
-       /* U/V black value for 10-bit colour */
-       static uint16_t const ten_bit_uv =      (1 << 9) - 1;
-       /* U/V black value for 16-bit colour */
-       static uint16_t const sixteen_bit_uv =  (1 << 15) - 1;
-
        switch (_pixel_format) {
        case AV_PIX_FMT_YUV420P:
        case AV_PIX_FMT_YUV422P: