Support alpha blend onto YUV444P9LE and YUV444P10LE (68 and 70).

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 366c1ae3592048bfcde1af20873f8c6eb3e129a6..801b39b0fced2f9feba50b9371e500d0c4b28bdc 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -911,6 +911,37 @@ alpha_blend_onto_yuv422p9or10le(TargetParams const& target, OtherYUVParams const
 }
 
 
+static
+void
+alpha_blend_onto_yuv444p9or10le(TargetParams const& target, OtherYUVParams const& other, std::function<float (uint8_t* data)> get_alpha)
+{
+       auto const ts = target.size;
+       auto const os = other.size;
+       for (int ty = target.start_y, oy = other.start_y; ty < ts.height && oy < os.height; ++ty, ++oy) {
+               uint16_t* tY = reinterpret_cast<uint16_t*>(target.data[0] + (ty * target.stride[0])) + target.start_x;
+               uint16_t* tU = reinterpret_cast<uint16_t*>(target.data[1] + (ty * target.stride[1])) + target.start_x;
+               uint16_t* tV = reinterpret_cast<uint16_t*>(target.data[2] + (ty * target.stride[2])) + target.start_x;
+               uint16_t* oY = reinterpret_cast<uint16_t*>(other.data[0] + (oy * other.stride[0])) + other.start_x;
+               uint16_t* oU = reinterpret_cast<uint16_t*>(other.data[1] + (oy * other.stride[1])) + other.start_x;
+               uint16_t* oV = reinterpret_cast<uint16_t*>(other.data[2] + (oy * other.stride[2])) + other.start_x;
+               uint8_t* alpha = other.alpha_data[0] + (oy * other.alpha_stride[0]) + other.start_x * other.alpha_bpp;
+               for (int tx = target.start_x, ox = other.start_x; tx < ts.width && ox < os.width; ++tx, ++ox) {
+                       float const a = get_alpha(alpha);
+                       *tY = *oY * a + *tY * (1 - a);
+                       *tU = *oU * a + *tU * (1 - a);
+                       *tV = *oV * a + *tV * (1 - a);
+                       ++tY;
+                       ++oY;
+                       ++tU;
+                       ++tV;
+                       ++oU;
+                       ++oV;
+                       alpha += other.alpha_bpp;
+               }
+       }
+}
+
+
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
@@ -1068,6 +1099,21 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                }
                break;
        }
+       case AV_PIX_FMT_YUV444P9LE:
+       case AV_PIX_FMT_YUV444P10LE:
+       {
+               auto yuv = other->convert_pixel_format (dcp::YUVToRGB::REC709, _pixel_format, Alignment::COMPACT, false);
+               other_yuv_params.data = yuv->data();
+               other_yuv_params.stride = yuv->stride();
+               other_yuv_params.alpha_data = other->data();
+               other_yuv_params.alpha_stride = other->stride();
+               if (other->pixel_format() == AV_PIX_FMT_RGBA64BE) {
+                       alpha_blend_onto_yuv444p9or10le(target_params, other_yuv_params, get_alpha_64be);
+               } else {
+                       alpha_blend_onto_yuv444p9or10le(target_params, other_yuv_params, get_alpha_byte);
+               }
+               break;
+       }
        default:
                throw PixelFormatError ("alpha_blend()", _pixel_format);
        }

diff --git a/test/image_test.cc b/test/image_test.cc
index 190e550abb3607ea31e577d427506cd41785be17..cad30813c6da0203b515d892a188d6c706eb4126 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -244,6 +244,8 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test)
        alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV420P10, "yuv420p10");
        alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P9LE, "yuv422p9le");
        alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
+       alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV444P9LE, "yuv444p9le");
+       alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV444P10LE, "yuv444p10le");
 
        alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGB24, "rgb24");
        alpha_blend_test_rgba64be_onto(AV_PIX_FMT_BGRA, "bgra");
@@ -253,6 +255,8 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test)
        alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV420P10, "yuv420p10");
        alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P9LE, "yuv422p9le");
        alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
+       alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV444P9LE, "yuv444p9le");
+       alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV444P10LE, "yuv444p10le");
 }