*/
/** @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) {
*/
assert (aligned ());
- shared_ptr<Image> scaled (new SimpleImage (pixel_format(), out_size, result_aligned));
+ shared_ptr<Image> scaled (new Image (pixel_format(), out_size, result_aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
*/
assert (aligned ());
- shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned));
+ shared_ptr<Image> rgb (new Image (PIX_FMT_RGB24, out_size, result_aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
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;
}
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)
+Image::Image (AVPixelFormat p, libdcp::Size s, bool aligned)
+ : _pixel_format (p)
, _size (s)
, _aligned (aligned)
{
}
void
-SimpleImage::allocate ()
+Image::allocate ()
{
_data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *));
_data[0] = _data[1] = _data[2] = _data[3] = 0;
}
}
-SimpleImage::SimpleImage (SimpleImage const & other)
- : Image (other)
+Image::Image (Image const & other)
+ : _pixel_format (other._pixel_format)
, _size (other._size)
, _aligned (other._aligned)
{
}
}
-SimpleImage::SimpleImage (AVFrame* frame)
- :
Image (static_cast<AVPixelFormat> (frame->format))
+Image::Image (AVFrame* frame)
+ :
_pixel_format (static_cast<AVPixelFormat> (frame->format))
, _size (frame->width, frame->height)
, _aligned (true)
{
}
}
-SimpleImage::SimpleImage (shared_ptr<const Image> other, bool aligned)
- : Image (*other.get())
+Image::Image (shared_ptr<const Image> other, bool aligned)
+ : _pixel_format (other->_pixel_format)
, _size (other->size())
, _aligned (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);
-
+ std::swap (_pixel_format, other._pixel_format);
std::swap (_size, other._size);
for (int i = 0; i < 4; ++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);
-}
-
projects / dcpomatic.git / blobdiff