Fix tests.

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

diff --git a/src/lib/image.cc b/src/lib/image.cc
index a12c61b3e8a9ce3992d5641d351926481e818361..0bff1a7ccfca18d9912b33e44dffa28e532c5f3c 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -53,22 +53,28 @@ Image::swap (Image& other)
        std::swap (_pixel_format, other._pixel_format);
 }
 
-/** @param n Component index.
- *  @return Number of lines in the image for the given component.
- */
 int
-Image::lines (int n) const
+Image::line_factor (int n) const
 {
        if (n == 0) {
-               return size().height;
+               return 1;
        }
-       
+
        AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
        if (!d) {
                throw PixelFormatError (N_("lines()"), _pixel_format);
        }
        
-       return size().height / pow(2, d->log2_chroma_h);
+       return pow (2.0f, d->log2_chroma_h);
+}
+
+/** @param n Component index.
+ *  @return Number of lines in the image for the given component.
+ */
+int
+Image::lines (int n) const
+{
+       return rint (ceil (static_cast<double>(size().height) / line_factor (n)));
 }
 
 /** @return Number of components */
@@ -207,12 +213,12 @@ Image::crop (Crop crop, bool aligned) const
        for (int c = 0; c < components(); ++c) {
                int const crop_left_in_bytes = bytes_per_pixel(c) * crop.left;
                int const cropped_width_in_bytes = bytes_per_pixel(c) * cropped_size.width;
-                       
+
                /* Start of the source line, cropped from the top but not the left */
-               uint8_t* in_p = data()[c] + crop.top * stride()[c];
+               uint8_t* in_p = data()[c] + (crop.top / out->line_factor(c)) * stride()[c];
                uint8_t* out_p = out->data()[c];
-               
-               for (int y = 0; y < cropped_size.height; ++y) {
+
+               for (int y = 0; y < out->lines(c); ++y) {
                        memcpy (out_p, in_p + crop_left_in_bytes, cropped_width_in_bytes);
                        in_p += stride()[c];
                        out_p += out->stride()[c];
@@ -248,11 +254,11 @@ void
 Image::make_black ()
 {
        /* U/V black value for 8-bit colour */
-       static uint8_t const eight_bit_uv = (1 << 7) - 1;
+       static uint8_t const eight_bit_uv =     (1 << 7) - 1;
        /* U/V black value for 9-bit colour */
-       static uint16_t const nine_bit_uv = (1 << 8) - 1;
+       static uint16_t const nine_bit_uv =     (1 << 8) - 1;
        /* U/V black value for 10-bit colour */
-       static uint16_t const ten_bit_uv =  (1 << 9) - 1;
+       static uint16_t const ten_bit_uv =      (1 << 9) - 1;
        /* U/V black value for 16-bit colour */
        static uint16_t const sixteen_bit_uv =  (1 << 15) - 1;
        
@@ -265,6 +271,14 @@ Image::make_black ()
                memset (data()[2], eight_bit_uv, lines(2) * stride()[2]);
                break;
 
+       case PIX_FMT_YUVJ420P:
+       case PIX_FMT_YUVJ422P:
+       case PIX_FMT_YUVJ444P:
+               memset (data()[0], 0, lines(0) * stride()[0]);
+               memset (data()[1], eight_bit_uv + 1, lines(1) * stride()[1]);
+               memset (data()[2], eight_bit_uv + 1, lines(2) * stride()[2]);
+               break;
+
        case PIX_FMT_YUV422P9LE:
        case PIX_FMT_YUV444P9LE:
                yuv_16_black (nine_bit_uv);
@@ -407,13 +421,13 @@ Image::bytes_per_pixel (int c) const
 
        bpp[0] = floor ((d->comp[0].depth_minus1 + 1 + 7) / 8);
        if (d->nb_components > 1) {
-               bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        if (d->nb_components > 2) {
-               bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        if (d->nb_components > 3) {
-               bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        
        if ((d->flags & PIX_FMT_PLANAR) == 0) {
@@ -494,12 +508,11 @@ SimpleImage::SimpleImage (AVFrame* frame)
        }
 }
 
-SimpleImage::SimpleImage (shared_ptr<const Image> other)
+SimpleImage::SimpleImage (shared_ptr<const Image> other, bool aligned)
        : Image (*other.get())
+       , _size (other->size())
+       , _aligned (aligned)
 {
-       _size = other->size ();
-       _aligned = true;
-
        allocate ();
 
        for (int i = 0; i < components(); ++i) {