using namespace std;
using namespace boost;
+using libdcp::Size;
+
+void
+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.
}
shared_ptr<Image>
-Image::scale (Size out_size, Scaler const * scaler) const
+Image::scale (Size out_size, Scaler const * scaler, bool aligned) const
{
assert (scaler);
- shared_ptr<Image> scaled (new AlignedImage (pixel_format(), out_size));
+ shared_ptr<Image> scaled (new SimpleImage (pixel_format(), out_size, aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
* @param scaler Scaler to use.
*/
shared_ptr<Image>
-Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler) const
+Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler, bool aligned) const
{
assert (scaler);
Size content_size = out_size;
content_size.width -= (padding * 2);
- shared_ptr<Image> rgb (new AlignedImage (PIX_FMT_RGB24, content_size));
+ shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, content_size, aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
scheme of things.
*/
if (padding > 0) {
- shared_ptr<Image> padded_rgb (new AlignedImage (PIX_FMT_RGB24, out_size));
+ shared_ptr<Image> padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size, aligned));
padded_rgb->make_black ();
/* XXX: we are cheating a bit here; we know the frame is RGB so we can
* @return Post-processed image.
*/
shared_ptr<Image>
-Image::post_process (string pp) const
+Image::post_process (string pp, bool aligned) const
{
- shared_ptr<Image> out (new AlignedImage (pixel_format(), size ()));
+ shared_ptr<Image> out (new SimpleImage (pixel_format(), size (), aligned));
int pp_format = 0;
switch (pixel_format()) {
return out;
}
+shared_ptr<Image>
+Image::crop (Crop crop, bool aligned) const
+{
+ Size cropped_size = size ();
+ cropped_size.width -= crop.left + crop.right;
+ cropped_size.height -= crop.top + crop.bottom;
+
+ shared_ptr<Image> out (new SimpleImage (pixel_format(), cropped_size, aligned));
+
+ 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* out_p = out->data()[c];
+
+ for (int y = 0; y < cropped_size.height; ++y) {
+ memcpy (out_p, in_p + crop_left_in_bytes, cropped_width_in_bytes);
+ in_p += line_size()[c];
+ out_p += out->line_size()[c];
+ }
+ }
+
+ return out;
+}
+
void
Image::make_black ()
{
}
void
-Image::alpha_blend (shared_ptr<Image> other, Position position)
+Image::alpha_blend (shared_ptr<const Image> other, Position position)
{
/* Only implemented for RGBA onto RGB24 so far */
assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA);
}
}
+
+float
+Image::bytes_per_pixel (int c) const
+{
+ if (c == 3) {
+ return 0;
+ }
+
+ switch (_pixel_format) {
+ case PIX_FMT_RGB24:
+ if (c == 0) {
+ return 3;
+ } else {
+ return 0;
+ }
+ case PIX_FMT_RGBA:
+ if (c == 0) {
+ return 4;
+ } else {
+ return 0;
+ }
+ case PIX_FMT_YUV420P:
+ case PIX_FMT_YUV422P:
+ if (c == 0) {
+ return 1;
+ } else {
+ return 0.5;
+ }
+ case PIX_FMT_YUV422P10LE:
+ if (c == 1) {
+ return 2;
+ } else {
+ return 1;
+ }
+ default:
+ assert (false);
+ }
+
+ return 0;
+}
+
+
/** Construct a SimpleImage of a given size and format, allocating memory
* as required.
*
* @param p Pixel format.
* @param s Size in pixels.
*/
-SimpleImage::SimpleImage (AVPixelFormat p, Size s, function<int (int)> rounder)
+SimpleImage::SimpleImage (AVPixelFormat p, Size s, bool aligned)
: Image (p)
, _size (s)
+ , _aligned (aligned)
+{
+ allocate ();
+}
+
+void
+SimpleImage::allocate ()
{
_data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *));
_data[0] = _data[1] = _data[2] = _data[3] = 0;
_stride = (int *) av_malloc (4 * sizeof (int));
_stride[0] = _stride[1] = _stride[2] = _stride[3] = 0;
- switch (p) {
- case PIX_FMT_RGB24:
- _line_size[0] = s.width * 3;
- break;
- case PIX_FMT_RGBA:
- _line_size[0] = s.width * 4;
- break;
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUV422P:
- _line_size[0] = s.width;
- _line_size[1] = s.width / 2;
- _line_size[2] = s.width / 2;
- break;
- case PIX_FMT_YUV422P10LE:
- _line_size[0] = s.width * 2;
- _line_size[1] = s.width;
- _line_size[2] = s.width;
- break;
- default:
- assert (false);
+ for (int i = 0; i < components(); ++i) {
+ _line_size[i] = _size.width * bytes_per_pixel(i);
+ _stride[i] = stride_round_up (i, _line_size, _aligned ? 32 : 1);
+ _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i));
}
+}
+
+SimpleImage::SimpleImage (SimpleImage const & other)
+ : Image (other)
+{
+ _size = other._size;
+ _aligned = other._aligned;
+
+ allocate ();
for (int i = 0; i < components(); ++i) {
- _stride[i] = rounder (_line_size[i]);
- _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i));
+ memcpy (_data[i], other._data[i], _line_size[i] * lines(i));
+ }
+}
+
+SimpleImage&
+SimpleImage::operator= (SimpleImage const & other)
+{
+ if (this == &other) {
+ return *this;
+ }
+
+ SimpleImage tmp (other);
+ swap (tmp);
+ return *this;
+}
+
+void
+SimpleImage::swap (SimpleImage & other)
+{
+ Image::swap (other);
+
+ std::swap (_size, other._size);
+
+ for (int i = 0; i < 4; ++i) {
+ std::swap (_data[i], other._data[i]);
+ std::swap (_line_size[i], other._line_size[i]);
+ std::swap (_stride[i], other._stride[i]);
}
+
+ std::swap (_aligned, other._aligned);
}
/** Destroy a SimpleImage */
return _size;
}
-AlignedImage::AlignedImage (AVPixelFormat f, Size s)
- : SimpleImage (f, s, boost::bind (round_up, _1, 32))
-{
-
-}
-
-CompactImage::CompactImage (AVPixelFormat f, Size s)
- : SimpleImage (f, s, boost::bind (round_up, _1, 1))
-{
-
-}
-
-CompactImage::CompactImage (shared_ptr<Image> im)
- : SimpleImage (im->pixel_format(), im->size(), boost::bind (round_up, _1, 1))
-{
- assert (components() == im->components());
-
- for (int c = 0; c < components(); ++c) {
-
- assert (line_size()[c] == im->line_size()[c]);
-
- uint8_t* t = data()[c];
- uint8_t* o = im->data()[c];
-
- for (int y = 0; y < lines(c); ++y) {
- memcpy (t, o, line_size()[c]);
- t += stride()[c];
- o += im->stride()[c];
- }
- }
-}
-
FilterBufferImage::FilterBufferImage (AVPixelFormat p, AVFilterBufferRef* b)
: Image (p)
, _buffer (b)
return Size (_buffer->video->w, _buffer->video->h);
}
-/** XXX: this could be generalised to use any format, but I don't
- * understand how avpicture_fill is supposed to be called with
- * multi-planar images.
- */
-RGBFrameImage::RGBFrameImage (Size s)
- : Image (PIX_FMT_RGB24)
- , _size (s)
+RGBPlusAlphaImage::RGBPlusAlphaImage (shared_ptr<const Image> im)
+ : SimpleImage (im->pixel_format(), im->size(), false)
{
- _frame = avcodec_alloc_frame ();
- if (_frame == 0) {
- throw EncodeError ("could not allocate frame");
- }
-
- _data = (uint8_t *) av_malloc (size().width * size().height * 3);
- avpicture_fill ((AVPicture *) _frame, _data, PIX_FMT_RGB24, size().width, size().height);
- _frame->width = size().width;
- _frame->height = size().height;
- _frame->format = PIX_FMT_RGB24;
-}
-
-RGBFrameImage::~RGBFrameImage ()
-{
- av_free (_data);
- av_free (_frame);
-}
-
-uint8_t **
-RGBFrameImage::data () const
-{
- return _frame->data;
-}
+ assert (im->pixel_format() == PIX_FMT_RGBA);
+
+ _alpha = (uint8_t *) av_malloc (im->size().width * im->size().height);
+
+ uint8_t* in = im->data()[0];
+ uint8_t* out = data()[0];
+ uint8_t* out_alpha = _alpha;
+ for (int y = 0; y < im->size().height; ++y) {
+ uint8_t* in_r = in;
+ for (int x = 0; x < im->size().width; ++x) {
+ *out++ = *in_r++;
+ *out++ = *in_r++;
+ *out++ = *in_r++;
+ *out_alpha++ = *in_r++;
+ }
-int *
-RGBFrameImage::line_size () const
-{
- return _frame->linesize;
+ in += im->stride()[0];
+ }
}
-int *
-RGBFrameImage::stride () const
+RGBPlusAlphaImage::~RGBPlusAlphaImage ()
{
- /* XXX? */
- return line_size ();
+ av_free (_alpha);
}
-Size
-RGBFrameImage::size () const
-{
- return _size;
-}
projects / dcpomatic.git / blobdiff