X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.cc;h=cd5749bb67fd85735f73a2c97f951f69c8287499;hp=e5265187f57e3a67458d72a3a9f66e0133366f4b;hb=c4ac1ba47652884a647103ec49b2de4c0b6e60a9;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc index e5265187f..cd5749bb6 100644 --- a/src/lib/magick_image_proxy.cc +++ b/src/lib/magick_image_proxy.cc @@ -1,64 +1,66 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include #include "magick_image_proxy.h" #include "cross.h" #include "exceptions.h" -#include "util.h" -#include "log.h" +#include "dcpomatic_socket.h" #include "image.h" -#include "log.h" +#include "compose.hpp" +#include +#include +#include #include "i18n.h" -#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); - using std::string; using std::cout; +using std::pair; +using std::make_pair; using boost::shared_ptr; +using boost::optional; using boost::dynamic_pointer_cast; -MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr log) - : ImageProxy (log) +MagickImageProxy::MagickImageProxy (boost::filesystem::path path) + : _path (path) { /* Read the file into a Blob */ - + boost::uintmax_t const size = boost::filesystem::file_size (path); FILE* f = fopen_boost (path, "rb"); if (!f) { - throw OpenFileError (path); + throw OpenFileError (path, errno, true); } - + uint8_t* data = new uint8_t[size]; if (fread (data, 1, size, f) != size) { delete[] data; throw ReadFileError (path); } - + fclose (f); _blob.update (data, size); delete[] data; } -MagickImageProxy::MagickImageProxy (shared_ptr, shared_ptr socket, shared_ptr log) - : ImageProxy (log) +MagickImageProxy::MagickImageProxy (shared_ptr, shared_ptr socket) { uint32_t const size = socket->read_uint32 (); uint8_t* data = new uint8_t[size]; @@ -67,15 +69,15 @@ MagickImageProxy::MagickImageProxy (shared_ptr, shared_ptr s delete[] data; } -shared_ptr -MagickImageProxy::image () const +pair, int> +MagickImageProxy::image (optional, optional) const { + boost::mutex::scoped_lock lm (_mutex); + if (_image) { - return _image; + return make_pair (_image, 0); } - LOG_TIMING ("[%1] MagickImageProxy begins decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length()); - Magick::Image* magick_image = 0; string error; try { @@ -100,27 +102,49 @@ MagickImageProxy::image () const /* If we failed both an auto-detect and a forced-Targa we give the error from the auto-detect. */ - throw DecodeError (String::compose (_("Could not decode image file (%1)"), error)); + if (_path) { + throw DecodeError (String::compose (_("Could not decode image file %1 (%2)"), _path->string(), error)); + } else { + throw DecodeError (String::compose (_("Could not decode image file (%1)"), error)); + } + } + + unsigned char const * data = static_cast(_blob.data()); + if (data[801] == 1 || magick_image->image()->colorspace == Magick::sRGBColorspace) { + /* Either: + 1. The transfer characteristic in this file is "printing density"; in this case ImageMagick sets the colour space + to LogColorspace, or + 2. The file is sRGB. + + Empirically we find that in these cases if we subsequently call colorSpace(Magick::RGBColorspace) the colours + are very wrong. To prevent this, set the image colour space to RGB to stop the ::colorSpace call below doing + anything. See #1123 and others. + */ + magick_image->image()->colorspace = Magick::RGBColorspace; } + magick_image->colorSpace(Magick::RGBColorspace); + dcp::Size size (magick_image->columns(), magick_image->rows()); - LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ()); - _image.reset (new Image (PIX_FMT_RGB24, size, true)); + _image.reset (new Image (AV_PIX_FMT_RGB24, size, true)); /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */ uint8_t* p = _image->data()[0]; for (int i = 0; i < size.height; ++i) { +#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE using namespace MagickCore; +#endif +#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE + using namespace MagickLib; +#endif magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); p += _image->stride()[0]; } delete magick_image; - LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length()); - - return _image; + return make_pair (_image, 0); } void @@ -147,6 +171,22 @@ MagickImageProxy::same (shared_ptr other) const if (_blob.length() != mp->_blob.length()) { return false; } - + return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0; } + +AVPixelFormat +MagickImageProxy::pixel_format () const +{ + return AV_PIX_FMT_RGB24; +} + +size_t +MagickImageProxy::memory_used () const +{ + size_t m = _blob.length(); + if (_image) { + m += _image->memory_used(); + } + return m; +}