X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=f8dc111b0ade72b8fc01e55575afbe12c278e2f0;hb=a8b5ac47b89927eb2495dba71393a8a073967560;hp=722ff5d3ceff24509edeb49bb21ca9c575148abb;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git diff --git a/src/lib/image.cc b/src/lib/image.cc index 722ff5d3c..f8dc111b0 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -18,42 +18,26 @@ */ /** @file src/image.cc - * @brief A set of classes to describe video images. + * @brief A class to describe a video image. */ -#include -#include #include -#include -#include -#include -#include extern "C" { -#include -#include #include -#include -#include #include #include +#include } #include "image.h" #include "exceptions.h" #include "scaler.h" -#include "i18n.h" - using std::string; using std::min; +using std::cout; using boost::shared_ptr; using libdcp::Size; -void -Image::swap (Image& other) -{ - std::swap (_pixel_format, other._pixel_format); -} - int Image::line_factor (int n) const { @@ -63,7 +47,7 @@ Image::line_factor (int n) const AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("lines()"), _pixel_format); + throw PixelFormatError ("lines()", _pixel_format); } return pow (2.0f, d->log2_chroma_h); @@ -84,7 +68,7 @@ Image::components () const { AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("components()"), _pixel_format); + throw PixelFormatError ("components()", _pixel_format); } if ((d->flags & PIX_FMT_PLANAR) == 0) { @@ -103,7 +87,7 @@ Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) */ assert (aligned ()); - shared_ptr scaled (new SimpleImage (pixel_format(), out_size, result_aligned)); + shared_ptr scaled (new Image (pixel_format(), out_size, result_aligned)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -136,7 +120,7 @@ Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, b */ assert (aligned ()); - shared_ptr rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned)); + shared_ptr rgb (new Image (PIX_FMT_RGB24, out_size, result_aligned)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -164,7 +148,7 @@ Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, b shared_ptr Image::post_process (string pp, bool aligned) const { - shared_ptr out (new SimpleImage (pixel_format(), size (), aligned)); + shared_ptr out (new Image (pixel_format(), size (), aligned)); int pp_format = 0; switch (pixel_format()) { @@ -183,7 +167,7 @@ Image::post_process (string pp, bool aligned) const case PIX_FMT_YUV444P10LE: pp_format = PP_FORMAT_444; default: - throw PixelFormatError (N_("post_process"), pixel_format()); + throw PixelFormatError ("post_process", pixel_format()); } pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX); @@ -209,11 +193,15 @@ Image::crop (Crop crop, bool aligned) const cropped_size.width -= crop.left + crop.right; cropped_size.height -= crop.top + crop.bottom; - shared_ptr out (new SimpleImage (pixel_format(), cropped_size, aligned)); + shared_ptr out (new Image (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; + /* bytes_per_pixel() could be a fraction; in this case the stride will be rounded + up, and we need to make sure that we copy over the width (up to the stride) + rather than short of the width; hence the ceil() here. + */ + int const cropped_width_in_bytes = ceil (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 / out->line_factor(c)) * stride()[c]; @@ -326,12 +314,12 @@ Image::make_black () } default: - throw PixelFormatError (N_("make_black()"), _pixel_format); + throw PixelFormatError ("make_black()", _pixel_format); } } void -Image::alpha_blend (shared_ptr other, Position position) +Image::alpha_blend (shared_ptr other, Position position) { /* Only implemented for RGBA onto RGB24 so far */ assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA); @@ -367,7 +355,7 @@ Image::alpha_blend (shared_ptr other, Position position) } void -Image::copy (shared_ptr other, Position position) +Image::copy (shared_ptr other, Position position) { /* Only implemented for RGB24 onto RGB24 so far */ assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGB24); @@ -411,7 +399,7 @@ Image::bytes_per_pixel (int c) const { AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("lines()"), _pixel_format); + throw PixelFormatError ("lines()", _pixel_format); } if (c >= components()) { @@ -439,22 +427,22 @@ Image::bytes_per_pixel (int c) const return bpp[c]; } -/** Construct a SimpleImage of a given size and format, allocating memory +/** Construct a Image of a given size and format, allocating memory * as required. * * @param p Pixel format. * @param s Size in pixels. */ -SimpleImage::SimpleImage (AVPixelFormat p, libdcp::Size s, bool aligned) - : Image (p) - , _size (s) +Image::Image (AVPixelFormat p, libdcp::Size s, bool aligned) + : libdcp::Image (s) + , _pixel_format (p) , _aligned (aligned) { allocate (); } void -SimpleImage::allocate () +Image::allocate () { _data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *)); _data[0] = _data[1] = _data[2] = _data[3] = 0; @@ -472,9 +460,9 @@ SimpleImage::allocate () } } -SimpleImage::SimpleImage (SimpleImage const & other) - : Image (other) - , _size (other._size) +Image::Image (Image const & other) + : libdcp::Image (other) + , _pixel_format (other._pixel_format) , _aligned (other._aligned) { allocate (); @@ -490,9 +478,9 @@ SimpleImage::SimpleImage (SimpleImage const & other) } } -SimpleImage::SimpleImage (AVFrame* frame) - : Image (static_cast (frame->format)) - , _size (frame->width, frame->height) +Image::Image (AVFrame* frame) + : libdcp::Image (libdcp::Size (frame->width, frame->height)) + , _pixel_format (static_cast (frame->format)) , _aligned (true) { allocate (); @@ -509,9 +497,9 @@ SimpleImage::SimpleImage (AVFrame* frame) } } -SimpleImage::SimpleImage (shared_ptr other, bool aligned) - : Image (*other.get()) - , _size (other->size()) +Image::Image (shared_ptr other, bool aligned) + : libdcp::Image (other) + , _pixel_format (other->_pixel_format) , _aligned (aligned) { allocate (); @@ -528,24 +516,24 @@ SimpleImage::SimpleImage (shared_ptr other, bool aligned) } } -SimpleImage& -SimpleImage::operator= (SimpleImage const & other) +Image& +Image::operator= (Image const & other) { if (this == &other) { return *this; } - SimpleImage tmp (other); + Image tmp (other); swap (tmp); return *this; } void -SimpleImage::swap (SimpleImage & other) +Image::swap (Image & other) { - Image::swap (other); + libdcp::Image::swap (other); - std::swap (_size, other._size); + std::swap (_pixel_format, other._pixel_format); for (int i = 0; i < 4; ++i) { std::swap (_data[i], other._data[i]); @@ -556,8 +544,8 @@ SimpleImage::swap (SimpleImage & other) std::swap (_aligned, other._aligned); } -/** Destroy a SimpleImage */ -SimpleImage::~SimpleImage () +/** Destroy a Image */ +Image::~Image () { for (int i = 0; i < components(); ++i) { av_free (_data[i]); @@ -569,60 +557,32 @@ SimpleImage::~SimpleImage () } uint8_t ** -SimpleImage::data () const +Image::data () const { return _data; } int * -SimpleImage::line_size () const +Image::line_size () const { return _line_size; } int * -SimpleImage::stride () const +Image::stride () const { return _stride; } libdcp::Size -SimpleImage::size () const +Image::size () const { return _size; } bool -SimpleImage::aligned () const +Image::aligned () const { return _aligned; } -RGBPlusAlphaImage::RGBPlusAlphaImage (shared_ptr im) - : SimpleImage (im->pixel_format(), im->size(), false) -{ - 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++; - } - - in += im->stride()[0]; - } -} - -RGBPlusAlphaImage::~RGBPlusAlphaImage () -{ - av_free (_alpha); -} -