Force initial update of progress so that the sub-job gets updates straight away.

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

diff --git a/src/lib/image.cc b/src/lib/image.cc
index dbea62d26b3b7363d7c33ce7df19dff170430a5f..048cc4ab64e2d7408bc3445cb7580faa0f830c62 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -155,10 +155,7 @@ Image::post_process (string pp, bool aligned) const
 shared_ptr<Image>
 Image::crop (Crop crop, bool aligned) const
 {
-       libdcp::Size cropped_size = size ();
-       cropped_size.width -= crop.left + crop.right;
-       cropped_size.height -= crop.top + crop.bottom;
-
+       libdcp::Size cropped_size = crop.apply (size ());
        shared_ptr<Image> out (new Image (pixel_format(), cropped_size, aligned));
 
        for (int c = 0; c < components(); ++c) {
@@ -185,18 +182,23 @@ Image::crop (Crop crop, bool aligned) const
 
 /** Blacken a YUV image whose bits per pixel is rounded up to 16 */
 void
-Image::yuv_16_black (uint16_t v)
+Image::yuv_16_black (uint16_t v, bool alpha)
 {
        memset (data()[0], 0, lines(0) * stride()[0]);
        for (int i = 1; i < 3; ++i) {
                int16_t* p = reinterpret_cast<int16_t*> (data()[i]);
-               for (int y = 0; y < size().height; ++y) {
+               for (int y = 0; y < lines(i); ++y) {
+                       /* We divide by 2 here because we are writing 2 bytes at a time */
                        for (int x = 0; x < line_size()[i] / 2; ++x) {
                                p[x] = v;
                        }
                        p += stride()[i] / 2;
                }
        }
+
+       if (alpha) {
+               memset (data()[3], 0, lines(3) * stride()[3]);
+       }
 }
 
 uint16_t
@@ -236,30 +238,70 @@ Image::make_black ()
 
        case PIX_FMT_YUV422P9LE:
        case PIX_FMT_YUV444P9LE:
-               yuv_16_black (nine_bit_uv);
+               yuv_16_black (nine_bit_uv, false);
                break;
 
        case PIX_FMT_YUV422P9BE:
        case PIX_FMT_YUV444P9BE:
-               yuv_16_black (swap_16 (nine_bit_uv));
+               yuv_16_black (swap_16 (nine_bit_uv), false);
                break;
                
        case PIX_FMT_YUV422P10LE:
        case PIX_FMT_YUV444P10LE:
-               yuv_16_black (ten_bit_uv);
+               yuv_16_black (ten_bit_uv, false);
                break;
 
        case PIX_FMT_YUV422P16LE:
        case PIX_FMT_YUV444P16LE:
-               yuv_16_black (sixteen_bit_uv);
+               yuv_16_black (sixteen_bit_uv, false);
                break;
                
        case PIX_FMT_YUV444P10BE:
        case PIX_FMT_YUV422P10BE:
-               yuv_16_black (swap_16 (ten_bit_uv));
+               yuv_16_black (swap_16 (ten_bit_uv), false);
+               break;
+
+       case AV_PIX_FMT_YUVA420P9BE:
+       case AV_PIX_FMT_YUVA422P9BE:
+       case AV_PIX_FMT_YUVA444P9BE:
+               yuv_16_black (swap_16 (nine_bit_uv), true);
+               break;
+               
+       case AV_PIX_FMT_YUVA420P9LE:
+       case AV_PIX_FMT_YUVA422P9LE:
+       case AV_PIX_FMT_YUVA444P9LE:
+               yuv_16_black (nine_bit_uv, true);
+               break;
+               
+       case AV_PIX_FMT_YUVA420P10BE:
+       case AV_PIX_FMT_YUVA422P10BE:
+       case AV_PIX_FMT_YUVA444P10BE:
+               yuv_16_black (swap_16 (ten_bit_uv), true);
+               break;
+               
+       case AV_PIX_FMT_YUVA420P10LE:
+       case AV_PIX_FMT_YUVA422P10LE:
+       case AV_PIX_FMT_YUVA444P10LE:
+               yuv_16_black (ten_bit_uv, true);
+               break;
+               
+       case AV_PIX_FMT_YUVA420P16BE:
+       case AV_PIX_FMT_YUVA422P16BE:
+       case AV_PIX_FMT_YUVA444P16BE:
+               yuv_16_black (swap_16 (sixteen_bit_uv), true);
+               break;
+               
+       case AV_PIX_FMT_YUVA420P16LE:
+       case AV_PIX_FMT_YUVA422P16LE:
+       case AV_PIX_FMT_YUVA444P16LE:
+               yuv_16_black (sixteen_bit_uv, true);
                break;
 
-       case PIX_FMT_RGB24:             
+       case PIX_FMT_RGB24:
+       case PIX_FMT_ARGB:
+       case PIX_FMT_RGBA:
+       case PIX_FMT_ABGR:
+       case PIX_FMT_BGRA:
                memset (data()[0], 0, lines(0) * stride()[0]);
                break;