#include "exceptions.h"
#include "scaler.h"
+#include "i18n.h"
+
using namespace std;
using namespace boost;
+using libdcp::Size;
void
Image::swap (Image& other)
case PIX_FMT_RGBA:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
+ case PIX_FMT_YUV444P9BE:
+ case PIX_FMT_YUV444P9LE:
+ case PIX_FMT_YUV444P10BE:
+ case PIX_FMT_YUV444P10LE:
+ case PIX_FMT_UYVY422:
return size().height;
default:
- assert (false);
+ throw PixelFormatError (N_("lines()"), _pixel_format);
}
return 0;
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
+ case PIX_FMT_YUV444P9BE:
+ case PIX_FMT_YUV444P9LE:
+ case PIX_FMT_YUV444P10BE:
+ case PIX_FMT_YUV444P10LE:
return 3;
case PIX_FMT_RGB24:
case PIX_FMT_RGBA:
+ case PIX_FMT_UYVY422:
return 1;
default:
- assert (false);
+ throw PixelFormatError (N_("components()"), _pixel_format);
}
return 0;
}
shared_ptr<Image>
-Image::scale (libdcp::Size out_size, Scaler const * scaler, bool aligned) const
+Image::scale (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> scaled (new SimpleImage (pixel_format(), out_size, aligned));
+ shared_ptr<Image> scaled (new SimpleImage (pixel_format(), out_size, result_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 (libdcp::Size out_size, int padding, Scaler const * scaler, bool aligned) const
+Image::scale_and_convert_to_rgb (libdcp::Size out_size, int padding, 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 ());
libdcp::Size content_size = out_size;
content_size.width -= (padding * 2);
- shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, content_size, aligned));
+ shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, content_size, result_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 SimpleImage (PIX_FMT_RGB24, out_size, aligned));
+ shared_ptr<Image> padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned));
padded_rgb->make_black ();
/* XXX: we are cheating a bit here; we know the frame is RGB so we can
break;
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_UYVY422:
pp_format = PP_FORMAT_422;
break;
+ case PIX_FMT_YUV444P:
+ case PIX_FMT_YUV444P9BE:
+ case PIX_FMT_YUV444P9LE:
+ case PIX_FMT_YUV444P10BE:
+ case PIX_FMT_YUV444P10LE:
+ pp_format = PP_FORMAT_444;
default:
- assert (false);
+ throw PixelFormatError (N_("post_process"), pixel_format());
}
pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX);
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];
+ in_p += stride()[c];
+ out_p += out->stride()[c];
}
}
return out;
}
+/** Blacken a YUV image whose bits per pixel is rounded up to 16 */
+void
+Image::yuv_16_black (uint16_t v)
+{
+ memset (data()[0], 0, lines(0) * stride()[0]);
+ for (int i = 1; i < 3; ++i) {
+ int16_t* p = reinterpret_cast<int16_t*> (data()[i]);
+ for (int y = 0; y < size().height; ++y) {
+ for (int x = 0; x < line_size()[i] / 2; ++x) {
+ p[x] = v;
+ }
+ p += stride()[i] / 2;
+ }
+ }
+}
+
+uint16_t
+Image::swap_16 (uint16_t v)
+{
+ return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
+}
+
void
Image::make_black ()
{
+ /* U/V black value for 8-bit colour */
+ 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;
+
+ /* U/V black value for 10-bit colour */
+ static uint16_t const ten_bit_uv = (1 << 9) - 1;
+
switch (_pixel_format) {
case PIX_FMT_YUV420P:
- case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P:
+ case PIX_FMT_YUV444P:
memset (data()[0], 0, lines(0) * stride()[0]);
- memset (data()[1], 0x80, lines(1) * stride()[1]);
- memset (data()[2], 0x80, lines(2) * stride()[2]);
+ memset (data()[1], eight_bit_uv, lines(1) * stride()[1]);
+ memset (data()[2], eight_bit_uv, lines(2) * stride()[2]);
+ break;
+
+ case PIX_FMT_YUV422P9LE:
+ case PIX_FMT_YUV444P9LE:
+ yuv_16_black (nine_bit_uv);
break;
+ case PIX_FMT_YUV422P9BE:
+ case PIX_FMT_YUV444P9BE:
+ yuv_16_black (swap_16 (nine_bit_uv));
+ break;
+
+ case PIX_FMT_YUV422P10LE:
+ case PIX_FMT_YUV444P10LE:
+ yuv_16_black (ten_bit_uv);
+ break;
+
+ case PIX_FMT_YUV444P10BE:
+ case PIX_FMT_YUV422P10BE:
+ yuv_16_black (swap_16 (ten_bit_uv));
+
case PIX_FMT_RGB24:
memset (data()[0], 0, lines(0) * stride()[0]);
break;
+ case PIX_FMT_UYVY422:
+ {
+ int const Y = lines(0);
+ int const X = line_size()[0];
+ uint8_t* p = data()[0];
+ for (int y = 0; y < Y; ++y) {
+ for (int x = 0; x < X / 4; ++x) {
+ *p++ = eight_bit_uv; // Cb
+ *p++ = 0; // Y0
+ *p++ = eight_bit_uv; // Cr
+ *p++ = 0; // Y1
+ }
+ }
+ break;
+ }
+
default:
- assert (false);
+ throw PixelFormatError (N_("make_black()"), _pixel_format);
}
}
for (int i = 0; i < components(); ++i) {
uint8_t* p = data()[i];
for (int y = 0; y < lines(i); ++y) {
- socket->read_definite_and_consume (p, line_size()[i], 30);
+ socket->read (p, line_size()[i]);
p += stride()[i];
}
}
for (int i = 0; i < components(); ++i) {
uint8_t* p = data()[i];
for (int y = 0; y < lines(i); ++y) {
- socket->write (p, line_size()[i], 30);
+ socket->write (p, line_size()[i]);
p += stride()[i];
}
}
return 0.5;
}
case PIX_FMT_YUV422P10LE:
- if (c == 1) {
+ if (c == 0) {
return 2;
} else {
return 1;
}
+ case PIX_FMT_UYVY422:
+ return 2;
+ case PIX_FMT_YUV444P:
+ return 3;
+ case PIX_FMT_YUV444P9BE:
+ case PIX_FMT_YUV444P9LE:
+ case PIX_FMT_YUV444P10LE:
+ case PIX_FMT_YUV444P10BE:
+ return 6;
default:
- assert (false);
+ throw PixelFormatError (N_("bytes_per_pixel()"), _pixel_format);
}
return 0;
allocate ();
for (int i = 0; i < components(); ++i) {
- memcpy (_data[i], other._data[i], _line_size[i] * lines(i));
+ uint8_t* p = _data[i];
+ uint8_t* q = other._data[i];
+ for (int j = 0; j < lines(i); ++j) {
+ memcpy (p, q, _line_size[i]);
+ p += stride()[i];
+ q += other.stride()[i];
+ }
+ }
+}
+
+SimpleImage::SimpleImage (shared_ptr<const Image> other)
+ : Image (*other.get())
+{
+ _size = other->size ();
+ _aligned = true;
+
+ allocate ();
+
+ for (int i = 0; i < components(); ++i) {
+ assert(line_size()[i] == other->line_size()[i]);
+ uint8_t* p = _data[i];
+ uint8_t* q = other->data()[i];
+ for (int j = 0; j < lines(i); ++j) {
+ memcpy (p, q, line_size()[i]);
+ p += stride()[i];
+ q += other->stride()[i];
+ }
}
}
return _size;
}
-FilterBufferImage::FilterBufferImage (AVPixelFormat p, AVFilterBufferRef* b)
- : Image (p)
- , _buffer (b)
+bool
+SimpleImage::aligned () const
{
+ return _aligned;
+}
+FrameImage::FrameImage (AVFrame* frame)
+ : Image (static_cast<AVPixelFormat> (frame->format))
+ , _frame (frame)
+{
+ _line_size = (int *) av_malloc (4 * sizeof (int));
+ _line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0;
+
+ for (int i = 0; i < components(); ++i) {
+ _line_size[i] = size().width * bytes_per_pixel(i);
+ }
}
-FilterBufferImage::~FilterBufferImage ()
+FrameImage::~FrameImage ()
{
- avfilter_unref_buffer (_buffer);
+ av_frame_free (&_frame);
+ av_free (_line_size);
}
uint8_t **
-FilterBufferImage::data () const
+FrameImage::data () const
{
- return _buffer->data;
+ return _frame->data;
}
int *
-FilterBufferImage::line_size () const
+FrameImage::line_size () const
{
- return _buffer->linesize;
+ return _line_size;
}
int *
-FilterBufferImage::stride () const
+FrameImage::stride () const
{
- /* XXX? */
- return _buffer->linesize;
+ /* AVFrame's `linesize' is what we call `stride' */
+ return _frame->linesize;
}
libdcp::Size
-FilterBufferImage::size () const
+FrameImage::size () const
+{
+ return libdcp::Size (_frame->width, _frame->height);
+}
+
+bool
+FrameImage::aligned () const
{
- return libdcp::Size (_buffer->video->w, _buffer->video->h);
+ return true;
}
RGBPlusAlphaImage::RGBPlusAlphaImage (shared_ptr<const Image> im)
projects / dcpomatic.git / blobdiff