Mark .exr as a valid image file.

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

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 2511df73ea87bed9638df60e324ea77a0bc24557..c3955c92add136e25accc3ff2e5aa9ea36cb81fd 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -429,6 +429,36 @@ Image::make_transparent ()
        memset (data()[0], 0, sample_size(0).height * stride()[0]);
 }
 
+template <class T>
+void
+component (
+       int n,
+       Image* base,
+       shared_ptr<const Image> other,
+       shared_ptr<const Image> rgba,
+       int start_base_x, int start_base_y,
+       int start_other_x, int start_other_y
+       )
+{
+       dcp::Size const base_size = base->sample_size(n);
+       dcp::Size const other_size = other->sample_size(n);
+       for (int by = start_base_y, oy = start_other_y; by < base_size.height && oy < other_size.height; ++by, ++oy) {
+               /* base image */
+               T* bp = ((T*) (base->data()[n] + by * base->stride()[n])) + start_base_x;
+               /* overlay image */
+               T* op = ((T*) (other->data()[n] + oy * other->stride()[n]));
+               /* original RGBA for alpha channel */
+               uint8_t* rp = rgba->data()[0] + oy * rgba->stride()[0];
+               for (int bx = start_base_x, ox = start_other_x; bx < base_size.width && ox < other_size.width; ++bx, ++ox) {
+                       float const alpha = float (rp[3]) / 255;
+                       *bp = *op * alpha + *bp * (1 - alpha);
+                       ++bp;
+                       ++op;
+                       rp += 4;
+               }
+       }
+}
+
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
@@ -547,36 +577,20 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
                break;
        }
        case AV_PIX_FMT_YUV420P:
+       {
+               shared_ptr<Image> yuv = other->scale (other->size(), dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
+               component<uint8_t> (0, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
+               component<uint8_t> (1, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
+               component<uint8_t> (2, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
+               break;
+       }
        case AV_PIX_FMT_YUV420P10:
+       case AV_PIX_FMT_YUV422P10LE:
        {
                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;
-                               }
-                       }
-               }
+               component<uint16_t> (0, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
+               component<uint8_t>  (1, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
+               component<uint8_t>  (2, this, yuv, other, start_tx, start_ty, start_ox, start_oy);
                break;
        }
        default:
@@ -1022,3 +1036,13 @@ 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));
+}