*/
/** @file src/image.cc
- * @brief A set of classes to describe video images.
+ * @brief A class to describe a video image.
*/
-#include <sstream>
-#include <iomanip>
#include <iostream>
-#include <sys/time.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <openjpeg.h>
extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
-#include <libpostproc/postprocess.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
+#include <libpostproc/postprocess.h>
}
#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
{
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);
{
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) {
}
shared_ptr<Image>
-Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const
+Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat result_format, bool result_aligned) const
{
assert (scaler);
/* Empirical testing suggests that sws_scale() will crash if
*/
assert (aligned ());
- shared_ptr<Image> scaled (new SimpleImage (pixel_format(), out_size, result_aligned));
+ shared_ptr<Image> scaled (new Image (result_format, out_size, result_aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
- out_size.width, out_size.height, pixel_format(),
+ out_size.width, out_size.height, result_format,
scaler->ffmpeg_id (), 0, 0, 0
);
return scaled;
}
-/** Scale this image to a given size and convert it to RGB.
- * @param out_size Output image size in pixels.
- * @param scaler Scaler to use.
- */
-shared_ptr<Image>
-Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const
-{
- assert (scaler);
- /* Empirical testing suggests that sws_scale() will crash if
- the input image is not aligned.
- */
- assert (aligned ());
-
- shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned));
-
- struct SwsContext* scale_context = sws_getContext (
- size().width, size().height, pixel_format(),
- out_size.width, out_size.height, PIX_FMT_RGB24,
- scaler->ffmpeg_id (), 0, 0, 0
- );
-
- /* Scale and convert to RGB from whatever its currently in (which may be RGB) */
- sws_scale (
- scale_context,
- data(), stride(),
- 0, size().height,
- rgb->data(), rgb->stride()
- );
-
- sws_freeContext (scale_context);
-
- return rgb;
-}
-
/** Run a FFmpeg post-process on this image and return the processed version.
* @param pp Flags for the required set of post processes.
* @return Post-processed image.
shared_ptr<Image>
Image::post_process (string pp, bool aligned) const
{
- shared_ptr<Image> out (new SimpleImage (pixel_format(), size (), aligned));
+ shared_ptr<Image> out (new Image (pixel_format(), size (), aligned));
int pp_format = 0;
switch (pixel_format()) {
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);
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));
+ shared_ptr<Image> 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];
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;
+ static uint16_t const sixteen_bit_uv = (1 << 15) - 1;
switch (_pixel_format) {
case PIX_FMT_YUV420P:
for (int y = 0; y < Y; ++y) {
for (int x = 0; x < X / 4; ++x) {
*p++ = eight_bit_uv; // Cb
- *p++ = 0; // Y0
+ *p++ = 0; // Y0
*p++ = eight_bit_uv; // Cr
- *p++ = 0; // Y1
+ *p++ = 0; // Y1
}
}
break;
}
default:
- throw PixelFormatError (N_("make_black()"), _pixel_format);
+ throw PixelFormatError ("make_black()", _pixel_format);
}
}
void
-Image::alpha_blend (shared_ptr<const Image> other, Position position)
+Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
{
/* Only implemented for RGBA onto RGB24 so far */
assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA);
}
void
-Image::copy (shared_ptr<const Image> other, Position position)
+Image::copy (shared_ptr<const Image> other, Position<int> position)
{
/* Only implemented for RGB24 onto RGB24 so far */
assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGB24);
{
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()) {
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;
_stride[0] = _stride[1] = _stride[2] = _stride[3] = 0;
for (int i = 0; i < components(); ++i) {
- _line_size[i] = _size.width * bytes_per_pixel(i);
+ _line_size[i] = ceil (_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));
+
+ /* The assembler function ff_rgb24ToY_avx (in libswscale/x86/input.asm)
+ uses a 16-byte fetch to read three bytes (R/G/B) of image data.
+ Hence on the last pixel of the last line it reads over the end of
+ the actual data by 1 byte. If the width of an image is a multiple
+ of the stride alignment there will be no padding at the end of image lines.
+ OS X crashes on this illegal read, though other operating systems don't
+ seem to mind. The nasty + 1 in this malloc makes sure there is always a byte
+ for that instruction to read safely.
+ */
+ _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i) + 1);
}
}
-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 ();
}
}
-SimpleImage::SimpleImage (AVFrame* frame)
- : Image (static_cast<AVPixelFormat> (frame->format))
- , _size (frame->width, frame->height)
+Image::Image (AVFrame* frame)
+ : libdcp::Image (libdcp::Size (frame->width, frame->height))
+ , _pixel_format (static_cast<AVPixelFormat> (frame->format))
, _aligned (true)
{
allocate ();
}
}
-SimpleImage::SimpleImage (shared_ptr<const Image> other, bool aligned)
- : Image (*other.get())
- , _size (other->size())
+Image::Image (shared_ptr<const Image> other, bool aligned)
+ : libdcp::Image (other)
+ , _pixel_format (other->_pixel_format)
, _aligned (aligned)
{
allocate ();
}
}
-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]);
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]);
}
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<const Image> 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);
-}
-