X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=c8303115b967f4f5c401166eff5077638927d01d;hb=44b57d623dec97a3f9955082f0b8a7a8d27b7518;hp=c8849303cac99e8ed01c1e6f6d5e80bffade6706;hpb=129afab72bfc026b5704c41a6bfc0f4b3a2c4033;p=dcpomatic.git diff --git a/src/lib/image.cc b/src/lib/image.cc index c8849303c..c8303115b 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include extern "C" { #include @@ -58,6 +59,8 @@ Image::lines (int n) const break; case PIX_FMT_RGB24: case PIX_FMT_RGBA: + case PIX_FMT_YUV422P10LE: + case PIX_FMT_YUV422P: return size().height; default: assert (false); @@ -72,6 +75,8 @@ Image::components () const { switch (_pixel_format) { case PIX_FMT_YUV420P: + case PIX_FMT_YUV422P10LE: + case PIX_FMT_YUV422P: return 3; case PIX_FMT_RGB24: case PIX_FMT_RGBA: @@ -88,7 +93,7 @@ Image::scale (Size out_size, Scaler const * scaler) const { assert (scaler); - shared_ptr scaled (new SimpleImage (pixel_format(), out_size)); + shared_ptr scaled (new AlignedImage (pixel_format(), out_size)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -98,9 +103,9 @@ Image::scale (Size out_size, Scaler const * scaler) const sws_scale ( scale_context, - data(), line_size(), + data(), stride(), 0, size().height, - scaled->data (), scaled->line_size () + scaled->data(), scaled->stride() ); sws_freeContext (scale_context); @@ -120,7 +125,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal Size content_size = out_size; content_size.width -= (padding * 2); - shared_ptr rgb (new SimpleImage (PIX_FMT_RGB24, content_size)); + shared_ptr rgb (new AlignedImage (PIX_FMT_RGB24, content_size)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -131,9 +136,9 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal /* Scale and convert to RGB from whatever its currently in (which may be RGB) */ sws_scale ( scale_context, - data(), line_size(), + data(), stride(), 0, size().height, - rgb->data (), rgb->line_size () + rgb->data(), rgb->stride() ); /* Put the image in the right place in a black frame if are padding; this is @@ -141,7 +146,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal scheme of things. */ if (padding > 0) { - shared_ptr padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size)); + shared_ptr padded_rgb (new AlignedImage (PIX_FMT_RGB24, out_size)); padded_rgb->make_black (); /* XXX: we are cheating a bit here; we know the frame is RGB so we can @@ -151,8 +156,8 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal uint8_t* q = rgb->data()[0]; for (int j = 0; j < rgb->lines(0); ++j) { memcpy (p, q, rgb->line_size()[0]); - p += padded_rgb->line_size()[0]; - q += rgb->line_size()[0]; + p += padded_rgb->stride()[0]; + q += rgb->stride()[0]; } rgb = padded_rgb; @@ -170,14 +175,27 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal shared_ptr Image::post_process (string pp) const { - shared_ptr out (new SimpleImage (PIX_FMT_YUV420P, size ())); - + shared_ptr out (new AlignedImage (pixel_format(), size ())); + + int pp_format = 0; + switch (pixel_format()) { + case PIX_FMT_YUV420P: + pp_format = PP_FORMAT_420; + break; + case PIX_FMT_YUV422P10LE: + case PIX_FMT_YUV422P: + pp_format = PP_FORMAT_422; + break; + default: + assert (false); + } + pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX); - pp_context* context = pp_get_context (size().width, size().height, PP_FORMAT_420 | PP_CPU_CAPS_MMX2); + pp_context* context = pp_get_context (size().width, size().height, pp_format | PP_CPU_CAPS_MMX2); pp_postprocess ( - (const uint8_t **) data(), line_size(), - out->data(), out->line_size(), + (const uint8_t **) data(), stride(), + out->data(), out->stride(), size().width, size().height, 0, 0, mode, context, 0 ); @@ -193,13 +211,15 @@ Image::make_black () { switch (_pixel_format) { case PIX_FMT_YUV420P: - memset (data()[0], 0, lines(0) * line_size()[0]); - memset (data()[1], 0x80, lines(1) * line_size()[1]); - memset (data()[2], 0x80, lines(2) * line_size()[2]); + case PIX_FMT_YUV422P10LE: + case PIX_FMT_YUV422P: + memset (data()[0], 0, lines(0) * stride()[0]); + memset (data()[1], 0x80, lines(1) * stride()[1]); + memset (data()[2], 0x80, lines(2) * stride()[2]); break; case PIX_FMT_RGB24: - memset (data()[0], 0, lines(0) * line_size()[0]); + memset (data()[0], 0, lines(0) * stride()[0]); break; default: @@ -230,8 +250,8 @@ Image::alpha_blend (shared_ptr other, Position position) } for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) { - uint8_t* tp = data()[0] + ty * line_size()[0] + position.x * 3; - uint8_t* op = other->data()[0] + oy * other->line_size()[0]; + uint8_t* tp = data()[0] + ty * stride()[0] + position.x * 3; + uint8_t* op = other->data()[0] + oy * other->stride()[0]; for (int tx = start_tx, ox = start_ox; tx < size().width && ox < other->size().width; ++tx, ++ox) { float const alpha = float (op[3]) / 255; tp[0] = (tp[0] * (1 - alpha)) + op[0] * alpha; @@ -243,39 +263,74 @@ Image::alpha_blend (shared_ptr other, Position position) } } +void +Image::read_from_socket (shared_ptr socket) +{ + 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); + p += stride()[i]; + } + } +} + +void +Image::write_to_socket (shared_ptr socket) const +{ + 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); + p += stride()[i]; + } + } +} + /** Construct a SimpleImage of a given size and format, allocating memory * as required. * * @param p Pixel format. * @param s Size in pixels. */ -SimpleImage::SimpleImage (PixelFormat p, Size s) +SimpleImage::SimpleImage (AVPixelFormat p, Size s, function rounder) : Image (p) , _size (s) { _data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *)); _data[0] = _data[1] = _data[2] = _data[3] = 0; - _line_size = (int *) av_malloc (4); + + _line_size = (int *) av_malloc (4 * sizeof (int)); _line_size[0] = _line_size[1] = _line_size[2] = _line_size[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] = round_up (s.width * 3, 32); + _line_size[0] = s.width * 3; break; case PIX_FMT_RGBA: - _line_size[0] = round_up (s.width * 4, 32); + _line_size[0] = s.width * 4; break; case PIX_FMT_YUV420P: - _line_size[0] = round_up (s.width, 32); - _line_size[1] = round_up (s.width / 2, 32); - _line_size[2] = round_up (s.width / 2, 32); + 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) { - _data[i] = (uint8_t *) av_malloc (_line_size[i] * lines (i)); + _stride[i] = rounder (_line_size[i]); + _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i)); } } @@ -288,6 +343,7 @@ SimpleImage::~SimpleImage () av_free (_data); av_free (_line_size); + av_free (_stride); } uint8_t ** @@ -302,14 +358,51 @@ SimpleImage::line_size () const return _line_size; } +int * +SimpleImage::stride () const +{ + return _stride; +} + Size SimpleImage::size () const { 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 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]); -FilterBufferImage::FilterBufferImage (PixelFormat p, AVFilterBufferRef* b) + 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) { @@ -333,6 +426,13 @@ FilterBufferImage::line_size () const return _buffer->linesize; } +int * +FilterBufferImage::stride () const +{ + /* XXX? */ + return _buffer->linesize; +} + Size FilterBufferImage::size () const { @@ -377,6 +477,13 @@ RGBFrameImage::line_size () const return _frame->linesize; } +int * +RGBFrameImage::stride () const +{ + /* XXX? */ + return line_size (); +} + Size RGBFrameImage::size () const {