Fix video scaling when the video needs rotation (#2791).

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

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 98c52c8e0452bd4255df4f20c227d763ee2cdcbe..2167918f8d1055c1c7fff274021797fb767b84bc 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -339,6 +339,10 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo
           the input image alignment is not PADDED.
        */
        DCPOMATIC_ASSERT (alignment() == Alignment::PADDED);
+       DCPOMATIC_ASSERT(size().width > 0);
+       DCPOMATIC_ASSERT(size().height > 0);
+       DCPOMATIC_ASSERT(out_size.width > 0);
+       DCPOMATIC_ASSERT(out_size.height > 0);
 
        auto scaled = make_shared<Image>(out_format, out_size, out_alignment);
        auto scale_context = sws_getContext (
@@ -347,6 +351,8 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo
                (fast ? SWS_FAST_BILINEAR : SWS_BICUBIC) | SWS_ACCURATE_RND, 0, 0, 0
                );
 
+       DCPOMATIC_ASSERT(scale_context);
+
        DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUVToRGB::COUNT);
        EnumIndexedVector<int, dcp::YUVToRGB> lut;
        lut[dcp::YUVToRGB::REC601] = SWS_CS_ITU601;
@@ -804,7 +810,7 @@ alpha_blend_onto_xyz12le(TargetParams const& target, OtherRGBParams const& other
 
 static
 void
-alpha_blend_onto_yuv420p(TargetParams const& target, OtherYUVParams const& other)
+alpha_blend_onto_yuv420p(TargetParams const& target, OtherYUVParams const& other, std::function<float (uint8_t* data)> get_alpha)
 {
        auto const ts = target.size;
        auto const os = other.size;
@@ -819,7 +825,7 @@ alpha_blend_onto_yuv420p(TargetParams const& target, OtherYUVParams const& other
                uint8_t* oV = other.data[2] + (hoy * other.stride[2]) + other.start_x / 2;
                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 = float(alpha[3]) / 255;
+                       float const a = get_alpha(alpha);
                        *tY = *oY * a + *tY * (1 - a);
                        *tU = *oU * a + *tU * (1 - a);
                        *tV = *oV * a + *tV * (1 - a);
@@ -841,7 +847,7 @@ alpha_blend_onto_yuv420p(TargetParams const& target, OtherYUVParams const& other
 
 static
 void
-alpha_blend_onto_yuv420p10(TargetParams const& target, OtherYUVParams const& other)
+alpha_blend_onto_yuv420p10(TargetParams const& target, OtherYUVParams const& other, std::function<float (uint8_t* data)> get_alpha)
 {
        auto const ts = target.size;
        auto const os = other.size;
@@ -856,7 +862,7 @@ alpha_blend_onto_yuv420p10(TargetParams const& target, OtherYUVParams const& oth
                uint16_t* oV = reinterpret_cast<uint16_t*>(other.data[2] + (hoy * other.stride[2])) + other.start_x / 2;
                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 = float(alpha[3]) / 255;
+                       float const a = get_alpha(alpha);
                        *tY = *oY * a + *tY * (1 - a);
                        *tU = *oU * a + *tU * (1 - a);
                        *tV = *oV * a + *tV * (1 - a);
@@ -878,7 +884,7 @@ alpha_blend_onto_yuv420p10(TargetParams const& target, OtherYUVParams const& oth
 
 static
 void
-alpha_blend_onto_yuv422p9or10le(TargetParams const& target, OtherYUVParams const& other)
+alpha_blend_onto_yuv422p9or10le(TargetParams const& target, OtherYUVParams const& other, std::function<float (uint8_t* data)> get_alpha)
 {
        auto const ts = target.size;
        auto const os = other.size;
@@ -891,7 +897,7 @@ alpha_blend_onto_yuv422p9or10le(TargetParams const& target, OtherYUVParams const
                uint16_t* oV = reinterpret_cast<uint16_t*>(other.data[2] + (oy * other.stride[2])) + other.start_x / 2;
                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 = float(alpha[3]) / 255;
+                       float const a = get_alpha(alpha);
                        *tY = *oY * a + *tY * (1 - a);
                        *tU = *oU * a + *tU * (1 - a);
                        *tV = *oV * a + *tV * (1 - a);
@@ -911,6 +917,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)
 {
@@ -976,6 +1013,14 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                return *p;
        };
 
+       auto get_alpha_64be = [](uint8_t* p) {
+               return ((static_cast<int16_t>(p[6]) << 8) | p[7]) / 65535.0f;
+       };
+
+       auto get_alpha_byte = [](uint8_t* p) {
+               return p[3] / 255.0f;
+       };
+
        switch (_pixel_format) {
        case AV_PIX_FMT_RGB24:
                target_params.bpp = 3;
@@ -1024,7 +1069,11 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                other_yuv_params.stride = yuv->stride();
                other_yuv_params.alpha_data = other->data();
                other_yuv_params.alpha_stride = other->stride();
-               alpha_blend_onto_yuv420p(target_params, other_yuv_params);
+               if (other->pixel_format() == AV_PIX_FMT_RGBA64BE) {
+                       alpha_blend_onto_yuv420p(target_params, other_yuv_params, get_alpha_64be);
+               } else {
+                       alpha_blend_onto_yuv420p(target_params, other_yuv_params, get_alpha_byte);
+               }
                break;
        }
        case AV_PIX_FMT_YUV420P10:
@@ -1034,7 +1083,11 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                other_yuv_params.stride = yuv->stride();
                other_yuv_params.alpha_data = other->data();
                other_yuv_params.alpha_stride = other->stride();
-               alpha_blend_onto_yuv420p10(target_params, other_yuv_params);
+               if (other->pixel_format() == AV_PIX_FMT_RGBA64BE) {
+                       alpha_blend_onto_yuv420p10(target_params, other_yuv_params, get_alpha_64be);
+               } else {
+                       alpha_blend_onto_yuv420p10(target_params, other_yuv_params, get_alpha_byte);
+               }
                break;
        }
        case AV_PIX_FMT_YUV422P9LE:
@@ -1043,7 +1096,28 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                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();
-               alpha_blend_onto_yuv422p9or10le(target_params, other_yuv_params);
+               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_yuv422p9or10le(target_params, other_yuv_params, get_alpha_64be);
+               } else {
+                       alpha_blend_onto_yuv422p9or10le(target_params, other_yuv_params, get_alpha_byte);
+               }
+               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: