X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=c403b61abfe9cee0daea7d74cdccd49820275b60;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=3df498c874efa6ac02885a88f7a101c6bb1deb4e;hpb=f213fd833a840fc97e3875979ae7dc7cbbc883b1;p=dcpomatic.git diff --git a/src/lib/image.cc b/src/lib/image.cc index 3df498c87..c403b61ab 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -23,7 +23,6 @@ #include "image.h" #include "exceptions.h" -#include "scaler.h" #include "timer.h" #include "rect.h" #include "util.h" @@ -57,7 +56,7 @@ Image::line_factor (int n) const if (!d) { throw PixelFormatError ("lines()", _pixel_format); } - + return pow (2.0f, d->log2_chroma_h); } @@ -82,15 +81,16 @@ Image::components () const if ((d->flags & PIX_FMT_PLANAR) == 0) { return 1; } - + return d->nb_components; } /** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */ shared_ptr -Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const +Image::crop_scale_window ( + Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned + ) const { - DCPOMATIC_ASSERT (scaler); /* Empirical testing suggests that sws_scale() will crash if the input image is not aligned. */ @@ -110,13 +110,26 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, S struct SwsContext* scale_context = sws_getContext ( cropped_size.width, cropped_size.height, pixel_format(), inter_size.width, inter_size.height, out_format, - scaler->ffmpeg_id (), 0, 0, 0 + SWS_BICUBIC, 0, 0, 0 ); if (!scale_context) { throw StringError (N_("Could not allocate SwsContext")); } + DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT); + int const lut[dcp::YUV_TO_RGB_COUNT] = { + SWS_CS_ITU601, + SWS_CS_ITU709 + }; + + sws_setColorspaceDetails ( + scale_context, + sws_getCoefficients (lut[yuv_to_rgb]), 0, + sws_getCoefficients (lut[yuv_to_rgb]), 0, + 0, 1 << 16, 1 << 16 + ); + /* Prepare input data pointers with crop */ uint8_t* scale_in_data[components()]; for (int c = 0; c < components(); ++c) { @@ -140,13 +153,12 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, S sws_freeContext (scale_context); - return out; + return out; } shared_ptr -Image::scale (dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const +Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned) const { - DCPOMATIC_ASSERT (scaler); /* Empirical testing suggests that sws_scale() will crash if the input image is not aligned. */ @@ -157,7 +169,20 @@ Image::scale (dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_forma struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), out_size.width, out_size.height, out_format, - scaler->ffmpeg_id (), 0, 0, 0 + SWS_BICUBIC, 0, 0, 0 + ); + + DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT); + int const lut[dcp::YUV_TO_RGB_COUNT] = { + SWS_CS_ITU601, + SWS_CS_ITU709 + }; + + sws_setColorspaceDetails ( + scale_context, + sws_getCoefficients (lut[yuv_to_rgb]), 0, + sws_getCoefficients (lut[yuv_to_rgb]), 0, + 0, 1 << 16, 1 << 16 ); sws_scale ( @@ -238,7 +263,7 @@ Image::make_black () 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; - + switch (_pixel_format) { case PIX_FMT_YUV420P: case PIX_FMT_YUV422P: @@ -266,7 +291,7 @@ Image::make_black () case PIX_FMT_YUV444P9BE: yuv_16_black (swap_16 (nine_bit_uv), false); break; - + case PIX_FMT_YUV422P10LE: case PIX_FMT_YUV444P10LE: yuv_16_black (ten_bit_uv, false); @@ -276,7 +301,7 @@ Image::make_black () case PIX_FMT_YUV444P16LE: yuv_16_black (sixteen_bit_uv, false); break; - + case PIX_FMT_YUV444P10BE: case PIX_FMT_YUV422P10BE: yuv_16_black (swap_16 (ten_bit_uv), false); @@ -287,31 +312,31 @@ Image::make_black () case AV_PIX_FMT_YUVA444P9BE: yuv_16_black (swap_16 (nine_bit_uv), true); break; - + case AV_PIX_FMT_YUVA420P9LE: case AV_PIX_FMT_YUVA422P9LE: case AV_PIX_FMT_YUVA444P9LE: yuv_16_black (nine_bit_uv, true); break; - + case AV_PIX_FMT_YUVA420P10BE: case AV_PIX_FMT_YUVA422P10BE: case AV_PIX_FMT_YUVA444P10BE: yuv_16_black (swap_16 (ten_bit_uv), true); break; - + case AV_PIX_FMT_YUVA420P10LE: case AV_PIX_FMT_YUVA422P10LE: case AV_PIX_FMT_YUVA444P10LE: yuv_16_black (ten_bit_uv, true); break; - + case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA444P16BE: yuv_16_black (swap_16 (sixteen_bit_uv), true); break; - + case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: @@ -394,7 +419,7 @@ Image::alpha_blend (shared_ptr other, Position position) tp[0] = op[0] * alpha + tp[0] * (1 - alpha); tp[1] = op[1] * alpha + tp[1] * (1 - alpha); tp[2] = op[2] * alpha + tp[2] * (1 - alpha); - + tp += this_bpp; op += other_bpp; } @@ -414,7 +439,7 @@ Image::alpha_blend (shared_ptr other, Position position) tp[1] = op[1] * alpha + tp[1] * (1 - alpha); tp[2] = op[2] * alpha + tp[2] * (1 - alpha); tp[3] = op[3] * alpha + tp[3] * (1 - alpha); - + tp += this_bpp; op += other_bpp; } @@ -433,7 +458,7 @@ Image::alpha_blend (shared_ptr other, Position position) tp[1] = op[0] * alpha + tp[1] * (1 - alpha); tp[3] = op[1] * alpha + tp[3] * (1 - alpha); tp[5] = op[2] * alpha + tp[5] * (1 - alpha); - + tp += this_bpp; op += other_bpp; } @@ -444,7 +469,7 @@ Image::alpha_blend (shared_ptr other, Position position) DCPOMATIC_ASSERT (false); } } - + void Image::copy (shared_ptr other, Position position) { @@ -458,7 +483,7 @@ Image::copy (shared_ptr other, Position position) uint8_t * const op = other->data()[0] + oy * other->stride()[0]; memcpy (tp, op, N * 3); } -} +} void Image::read_from_socket (shared_ptr socket) @@ -509,7 +534,7 @@ Image::bytes_per_pixel (int c) const if (d->nb_components > 3) { bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w); } - + if ((d->flags & PIX_FMT_PLANAR) == 0) { /* Not planar; sum them up */ return bpp[0] + bpp[1] + bpp[2] + bpp[3]; @@ -525,7 +550,7 @@ Image::bytes_per_pixel (int c) const * @param s Size in pixels. */ Image::Image (AVPixelFormat p, dcp::Size s, bool aligned) - : dcp::Image (s) + : _size (s) , _pixel_format (p) , _aligned (aligned) { @@ -537,10 +562,10 @@ Image::allocate () { _data = (uint8_t **) wrapped_av_malloc (4 * sizeof (uint8_t *)); _data[0] = _data[1] = _data[2] = _data[3] = 0; - + _line_size = (int *) wrapped_av_malloc (4 * sizeof (int)); _line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0; - + _stride = (int *) wrapped_av_malloc (4 * sizeof (int)); _stride[0] = _stride[1] = _stride[2] = _stride[3] = 0; @@ -567,8 +592,8 @@ Image::allocate () } Image::Image (Image const & other) - : dcp::Image (other) - , _pixel_format (other._pixel_format) + : _size (other._size) + , _pixel_format (other._pixel_format) , _aligned (other._aligned) { allocate (); @@ -585,7 +610,7 @@ Image::Image (Image const & other) } Image::Image (AVFrame* frame) - : dcp::Image (dcp::Size (frame->width, frame->height)) + : _size (frame->width, frame->height) , _pixel_format (static_cast (frame->format)) , _aligned (true) { @@ -604,7 +629,7 @@ Image::Image (AVFrame* frame) } Image::Image (shared_ptr other, bool aligned) - : dcp::Image (other) + : _size (other->_size) , _pixel_format (other->_pixel_format) , _aligned (aligned) { @@ -637,8 +662,7 @@ Image::operator= (Image const & other) void Image::swap (Image & other) { - dcp::Image::swap (other); - + std::swap (_size, other._size); std::swap (_pixel_format, other._pixel_format); for (int i = 0; i < 4; ++i) { @@ -717,18 +741,6 @@ merge (list images) return PositionImage (merged, all.position ()); } -string -Image::digest () const -{ - MD5Digester digester; - - for (int i = 0; i < components(); ++i) { - digester.add (data()[i], line_size()[i]); - } - - return digester.get (); -} - bool operator== (Image const & a, Image const & b) { @@ -756,6 +768,9 @@ operator== (Image const & a, Image const & b) return true; } +/** Fade the image. + * @param f Amount to fade by; 0 is black, 1 is no fade. + */ void Image::fade (float f) { @@ -799,6 +814,7 @@ Image::fade (float f) case AV_PIX_FMT_YUVA420P10LE: case AV_PIX_FMT_YUVA422P10LE: case AV_PIX_FMT_YUVA444P10LE: + case AV_PIX_FMT_RGB48LE: /* 16-bit little-endian */ for (int c = 0; c < 3; ++c) { int const stride_pixels = stride()[c] / 2; @@ -828,6 +844,7 @@ Image::fade (float f) case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA444P16BE: + case AV_PIX_FMT_RGB48BE: /* 16-bit big-endian */ for (int c = 0; c < 3; ++c) { int const stride_pixels = stride()[c] / 2;