Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / magick_image_proxy.cc

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index e5265187f57e3a67458d72a3a9f66e0133366f4b..d207e0561de2eb33967434a6edc19c7436c75412 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,64 +1,63 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
-#include <Magick++.h>
 #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 <Magick++.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
-
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 using boost::dynamic_pointer_cast;
 
-MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr<Log> log)
-       : ImageProxy (log)
+MagickImageProxy::MagickImageProxy (boost::filesystem::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);
        }
-               
+
        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<cxml::Node>, shared_ptr<Socket> socket, shared_ptr<Log> log)
-       : ImageProxy (log)
+MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket)
 {
        uint32_t const size = socket->read_uint32 ();
        uint8_t* data = new uint8_t[size];
@@ -68,14 +67,14 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>) const
 {
+       boost::mutex::scoped_lock lm (_mutex);
+
        if (_image) {
                return _image;
        }
 
-       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 {
@@ -104,22 +103,24 @@ MagickImageProxy::image () const
        }
 
        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;
 }
 
@@ -147,6 +148,12 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> 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;
+}