Add pixel format 66 (AV_PIX_FMT_YUV422P10LE) to make_part_black().

Part of fix for #1984.

Backported-from-commit: 2aa6fd88e6d334c040d421938e425bd2f89983a7
Backported-from-branch: 2.15.x

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 49acdb5c2cd7ba0a5a17376109f4f1d1e8092f64..7da2edef97dbe06c9af749d3f0aae4a2cc0260b5 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
@@ -377,7 +386,7 @@ Image::swap_16 (uint16_t v)
 }
 
 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 +404,33 @@ 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_YUV422P10LE:
+       {
+               int const bpp_0 = bytes_per_pixel(0);
+               int const h_0 = sample_size(0).height;
+               int const stride_0 = stride()[0];
+               auto p = data()[0];
+               for (int y = 0; y < h_0; ++y) {
+                       memset (p + start * bpp_0, 0xff, width * bpp_0);
+                       p += stride_0;
+               }
+               for (int i = 1; i < 3; ++i) {
+                       auto p = reinterpret_cast<int16_t*>(data()[i]);
+                       int const lines = sample_size(i).height;
+                       for (int y = 0; y < lines; ++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 +439,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:

diff --git a/src/lib/image.h b/src/lib/image.h
index 51d768a13971a9868aaab2e655edd41f58f066f6..8447192775a0fcc5dea8d23adbe84096c4e3a29d 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -89,6 +89,7 @@ public:
 
 private:
        friend struct pixel_formats_test;
+       friend struct make_part_black_test;
 
        void allocate ();
        void swap (Image &);

diff --git a/test/image_test.cc b/test/image_test.cc
index 2f66cf41d042919a7ed7374b867419ce5d94ded5..8aebd6bafe138401de61a2365bdeb656c66127c9 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -26,6 +26,8 @@
 
 #include "lib/compose.hpp"
 #include "lib/image.h"
+#include "lib/image_content.h"
+#include "lib/image_decoder.h"
 #include "lib/ffmpeg_image_proxy.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -394,6 +396,7 @@ BOOST_AUTO_TEST_CASE (fade_test)
        fade_test_format_red   (AV_PIX_FMT_RGB48LE,   1,   "rgb48le_100");
 }
 
+
 /** Make sure the image isn't corrupted if it is cropped too much.  This can happen when a
  *  filler 128x128 black frame is emitted from the FFmpegDecoder and the overall crop in either direction
  *  is greater than 128 pixels.

diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 2ed5db8eff55c91286e7045fde006460328bae39..a639e079e90fa0c39a93b3e758a56db9d996c75f 100644 (file)
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -30,9 +30,11 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include "lib/ffmpeg_image_proxy.h"
 #include "lib/image.h"
 
 using std::list;
+using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (make_black_test)
 {
@@ -98,3 +100,63 @@ BOOST_AUTO_TEST_CASE (make_black_test)
                ++N;
        }
 }
+
+
+BOOST_AUTO_TEST_CASE (make_part_black_test)
+{
+       shared_ptr<FFmpegImageProxy> proxy (new FFmpegImageProxy("test/data/flat_red.png"));
+       shared_ptr<Image> original = proxy->image().first;
+
+       list<AVPixelFormat> pix_fmts = {
+               AV_PIX_FMT_RGB24,
+               AV_PIX_FMT_ARGB,
+               AV_PIX_FMT_RGBA,
+               AV_PIX_FMT_ABGR,
+               AV_PIX_FMT_BGRA,
+               AV_PIX_FMT_YUV422P10LE,
+       };
+
+       list<std::pair<int, int> > positions = {
+               { 0, 256 },
+               { 128, 64 },
+       };
+
+       int N = 0;
+       for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
+               for (list<std::pair<int, int> >::const_iterator j = positions.begin(); j != positions.end(); ++j) {
+                       shared_ptr<Image> foo = original->convert_pixel_format(dcp::YUV_TO_RGB_REC601, *i, true, false);
+                       foo->make_part_black (j->first, j->second);
+                       shared_ptr<Image> bar = foo->convert_pixel_format (dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
+
+                       uint8_t* p = bar->data()[0];
+                       for (int y = 0; y < bar->size().height; ++y) {
+                               uint8_t* q = p;
+                               for (int x = 0; x < bar->size().width; ++x) {
+                                       int r = *q++;
+                                       int g = *q++;
+                                       int b = *q++;
+                                       if (x >= j->first && x < (j->first + j->second)) {
+                                               BOOST_CHECK_MESSAGE (
+                                                       r < 3, "red=" << static_cast<int>(r) << " at x=" << x << " format " << *i << " from " << j->first << " width " << j->second
+                                                       );
+                                       } else {
+                                               BOOST_CHECK_MESSAGE (
+                                                       r >= 252, "red=" << static_cast<int>(r) << " at x=" << x << " format " << *i << " from " << j->first << " width " << j->second
+                                                       );
+
+                                       }
+                                       BOOST_CHECK_MESSAGE (
+                                               g == 0, "green=" << static_cast<int>(g) << " at x=" << x << " format " << *i << " from " << j->first << " width " << j->second
+                                               );
+                                       BOOST_CHECK_MESSAGE (
+                                               b == 0, "blue=" << static_cast<int>(b) << " at x=" << x << " format " << *i << " from " << j->first << " width " << j->second
+                                               );
+                               }
+                               p += bar->stride()[0];
+                       }
+
+                       ++N;
+               }
+       }
+}
+