Fix alpha blending with with offset; should help with #1155.
[dcpomatic.git] / src / lib / image.cc
index 2511df73ea87bed9638df60e324ea77a0bc24557..b85451fb32f11ef4101363f27544eba9961c04e4 100644 (file)
@@ -68,15 +68,16 @@ Image::vertical_factor (int n) const
 int
 Image::horizontal_factor (int n) const
 {
-       int horizontal_factor = 1;
-       if (n > 0) {
-               AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (_pixel_format);
-               if (!d) {
-                       throw PixelFormatError ("sample_size()", _pixel_format);
-               }
-               horizontal_factor = pow (2.0f, d->log2_chroma_w);
+       if (n == 0) {
+               return 1;
+       }
+
+       AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
+       if (!d) {
+               throw PixelFormatError ("sample_size()", _pixel_format);
        }
-       return horizontal_factor;
+
+       return pow (2.0f, d->log2_chroma_w);
 }
 
 /** @param n Component index.
@@ -204,7 +205,7 @@ Image::crop_scale_window (
 
        uint8_t* scale_out_data[out->planes()];
        for (int c = 0; c < out->planes(); ++c) {
-               scale_out_data[c] = out->data()[c] + lrintf (out->bytes_per_pixel(c) * corner.x) + out->stride()[c] * corner.y;
+               scale_out_data[c] = out->data()[c] + lrintf (out->bytes_per_pixel(c) * corner.x) + out->stride()[c] * (corner.y / out->vertical_factor(c));
        }
 
        sws_scale (
@@ -219,6 +220,12 @@ Image::crop_scale_window (
        return out;
 }
 
+shared_ptr<Image>
+Image::convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned, bool fast) const
+{
+       return scale(size(), yuv_to_rgb, out_format, out_aligned, fast);
+}
+
 /** @param out_size Size to scale to.
  *  @param yuv_to_rgb YUVToRGB transform transform to use, if required.
  *  @param out_format Output pixel format.
@@ -547,34 +554,66 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                break;
        }
        case AV_PIX_FMT_YUV420P:
-       case AV_PIX_FMT_YUV420P10:
        {
-               shared_ptr<Image> yuv = other->scale (other->size(), dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
-
-               for (int i = 0; i < 3; ++i) {
-                       dcp::Size const tsize = sample_size(i);
-                       dcp::Size const osize = yuv->sample_size(i);
-                       int const tbpp = ceil (bytes_per_pixel(i) / horizontal_factor(i));
-                       int const obpp = ceil (yuv->bytes_per_pixel(i) / yuv->horizontal_factor(i));
-                       int const abpp = other->bytes_per_pixel(0);
-                       start_tx /= horizontal_factor (i);
-                       start_ty /= vertical_factor (i);
-                       start_ox /= yuv->horizontal_factor (i);
-                       start_oy /= yuv->vertical_factor (i);
-                       for (int ty = start_ty, oy = start_oy; ty < tsize.height && oy < osize.height; ++ty, ++oy) {
-                               /* this image */
-                               uint8_t* tp = data()[i] + ty * stride()[i] + start_tx * tbpp;
-                               /* overlay image */
-                               uint8_t* op = yuv->data()[i] + oy * yuv->stride()[i];
-                               /* original RGBA for alpha channel */
-                               uint8_t* ap = other->data()[0] + oy * other->stride()[0];
-                               for (int tx = start_tx, ox = start_ox; tx < tsize.width && ox < osize.width; ++tx, ++ox) {
-                                       float const alpha = float (ap[3]) / 255;
-                                       *tp = *op * alpha + *tp * (1 - alpha);
-                                       tp += tbpp;
-                                       op += obpp;
-                                       ap += abpp;
+               shared_ptr<Image> yuv = other->convert_pixel_format (dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
+               dcp::Size const ts = size();
+               dcp::Size const os = yuv->size();
+               for (int ty = start_ty, oy = start_oy; ty < ts.height && oy < os.height; ++ty, ++oy) {
+                       int const hty = ty / 2;
+                       int const hoy = oy / 2;
+                       uint8_t* tY = data()[0] + (ty * stride()[0]) + start_tx;
+                       uint8_t* tU = data()[1] + (hty * stride()[1]) + start_tx / 2;
+                       uint8_t* tV = data()[2] + (hty * stride()[2]) + start_tx / 2;
+                       uint8_t* oY = yuv->data()[0] + (oy * yuv->stride()[0]) + start_ox;
+                       uint8_t* oU = yuv->data()[1] + (hoy * yuv->stride()[1]) + start_ox / 2;
+                       uint8_t* oV = yuv->data()[2] + (hoy * yuv->stride()[2]) + start_ox / 2;
+                       uint8_t* alpha = other->data()[0] + (oy * other->stride()[0]) + start_ox * 4;
+                       for (int tx = start_tx, ox = start_ox; tx < ts.width && ox < os.width; ++tx, ++ox) {
+                               float const a = float(alpha[3]) / 255;
+                               *tY = *oY * a + *tY * (1 - a);
+                               *tU = *oU * a + *tU * (1 - a);
+                               *tV = *oV * a + *tV * (1 - a);
+                               ++tY;
+                               ++oY;
+                               if (tx % 2) {
+                                       ++tU;
+                                       ++tV;
+                               }
+                               if (ox % 2) {
+                                       ++oU;
+                                       ++oV;
                                }
+                               alpha += 4;
+                       }
+               }
+               break;
+       }
+       case AV_PIX_FMT_YUV420P10:
+       case AV_PIX_FMT_YUV422P10LE:
+       {
+               shared_ptr<Image> yuv = other->convert_pixel_format (dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
+               dcp::Size const ts = size();
+               dcp::Size const os = yuv->size();
+               for (int ty = start_ty, oy = start_oy; ty < ts.height && oy < os.height; ++ty, ++oy) {
+                       uint16_t* tY = (uint16_t *) (data()[0] + (ty * stride()[0])) + start_tx;
+                       uint8_t* tU = data()[1] + (ty * stride()[1]) + start_tx;
+                       uint8_t* tV = data()[2] + (ty * stride()[2]) + start_tx;
+                       uint16_t* oY = (uint16_t *) (yuv->data()[0] + (oy * yuv->stride()[0])) + start_ox;
+                       uint8_t* oU = yuv->data()[1] + (oy * yuv->stride()[1]) + start_ox;
+                       uint8_t* oV = yuv->data()[2] + (oy * yuv->stride()[2]) + start_ox;
+                       uint8_t* alpha = other->data()[0] + (oy * other->stride()[0]) + start_ox * 4;
+                       for (int tx = start_tx, ox = start_ox; tx < ts.width && ox < os.width; ++tx, ++ox) {
+                               float const a = float(alpha[3]) / 255;
+                               *tY = *oY * a + *tY * (1 - a);
+                               *tU = *oU * a + *tU * (1 - a);
+                               *tV = *oV * a + *tV * (1 - a);
+                               ++tY;
+                               ++tU;
+                               ++tV;
+                               ++oY;
+                               ++oU;
+                               ++oV;
+                               alpha += 4;
                        }
                }
                break;
@@ -1022,3 +1061,23 @@ Image::fade (float f)
                throw PixelFormatError ("fade()", _pixel_format);
        }
 }
+
+shared_ptr<Image>
+Image::ensure_aligned (shared_ptr<Image> image)
+{
+       if (image->aligned()) {
+               return image;
+       }
+
+       return shared_ptr<Image> (new Image (image, true));
+}
+
+size_t
+Image::memory_used () const
+{
+       size_t m = 0;
+       for (int i = 0; i < planes(); ++i) {
+               m += _stride[i] * sample_size(i).height;
+       }
+       return m;
+}