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)
{
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);
}
break;
}
+ case AV_PIX_FMT_YUV420P10:
+ {
+ shared_ptr<Image> yuv = other->scale (other->size(), dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
+ 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:
throw PixelFormatError ("alpha_blend()", _pixel_format);
}
int vertical_factor (int) const;
int horizontal_factor (int) const;
dcp::Size sample_size (int) const;
+ float bytes_per_pixel (int) const;
boost::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
boost::shared_ptr<Image> crop_scale_window (
void allocate ();
void swap (Image &);
- float bytes_per_pixel (int) const;
void yuv_16_black (uint16_t, bool);
static uint16_t swap_16 (uint16_t);
/** Test Image::alpha_blend */
BOOST_AUTO_TEST_CASE (alpha_blend_test)
{
+ alpha_blend_test_one (AV_PIX_FMT_RGB24, "rgb24");
+ alpha_blend_test_one (AV_PIX_FMT_BGRA, "bgra");
alpha_blend_test_one (AV_PIX_FMT_RGBA, "rgba");
+ alpha_blend_test_one (AV_PIX_FMT_RGB48LE, "rgb48le");
alpha_blend_test_one (AV_PIX_FMT_YUV420P, "yuv420p");
+ alpha_blend_test_one (AV_PIX_FMT_YUV420P10LE, "yuv420p10le");
}
/** Test merge (list<PositionImage>) with a single image */
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
ref_image.read (ref.string ());
Magick::Image check_image;
check_image.read (check.string ());
- DCPOMATIC_ASSERT (ref_image.compare (check_image));
+ BOOST_CHECK_MESSAGE (ref_image.compare (check_image), ref << " differs from " << check);
}
void