X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=e16fab0630af1bece7092f6579c967d15a8315c3;hp=1eb9c169c5c3b375d4677b61f6b19bdc58af71db;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71 diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 1eb9c169c..e16fab063 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -1,171 +1,49 @@ /* Copyright (C) 2014 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 -#include #include "image_proxy.h" +#include "raw_image_proxy.h" +#include "ffmpeg_image_proxy.h" +#include "j2k_image_proxy.h" #include "image.h" #include "exceptions.h" #include "cross.h" -#include "log.h" +#include +#include +#include #include "i18n.h" -#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); - using std::cout; using std::string; -using std::stringstream; using boost::shared_ptr; -ImageProxy::ImageProxy (shared_ptr log) - : _log (log) -{ - -} - -RawImageProxy::RawImageProxy (shared_ptr image, shared_ptr log) - : ImageProxy (log) - , _image (image) -{ - -} - -RawImageProxy::RawImageProxy (shared_ptr xml, shared_ptr socket, shared_ptr log) - : ImageProxy (log) -{ - dcp::Size size ( - xml->number_child ("Width"), xml->number_child ("Height") - ); - - _image.reset (new Image (static_cast (xml->number_child ("PixelFormat")), size, true)); - _image->read_from_socket (socket); -} - -shared_ptr -RawImageProxy::image () const -{ - return _image; -} - -void -RawImageProxy::add_metadata (xmlpp::Node* node) const -{ - node->add_child("Type")->add_child_text (N_("Raw")); - node->add_child("Width")->add_child_text (dcp::raw_convert (_image->size().width)); - node->add_child("Height")->add_child_text (dcp::raw_convert (_image->size().height)); - node->add_child("PixelFormat")->add_child_text (dcp::raw_convert (_image->pixel_format ())); -} - -void -RawImageProxy::send_binary (shared_ptr socket) const -{ - _image->write_to_socket (socket); -} - -MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr log) - : ImageProxy (log) -{ - /* 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, shared_ptr socket, shared_ptr log) - : ImageProxy (log) -{ - uint32_t const size = socket->read_uint32 (); - uint8_t* data = new uint8_t[size]; - socket->read (data, size); - _blob.update (data, size); - delete[] data; -} - -shared_ptr -MagickImageProxy::image () const -{ - 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; - try { - magick_image = new Magick::Image (_blob); - } catch (...) { - throw DecodeError (_("Could not decode image file")); - } - - 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)); - - /* 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) { - using namespace MagickCore; - magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); - p += _image->stride()[0]; - } - - LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length()); - - return _image; -} - -void -MagickImageProxy::add_metadata (xmlpp::Node* node) const -{ - node->add_child("Type")->add_child_text (N_("Magick")); -} - -void -MagickImageProxy::send_binary (shared_ptr socket) const -{ - socket->write (_blob.length ()); - socket->write ((uint8_t *) _blob.data (), _blob.length ()); -} - shared_ptr -image_proxy_factory (shared_ptr xml, shared_ptr socket, shared_ptr log) +image_proxy_factory (shared_ptr xml, shared_ptr socket) { if (xml->string_child("Type") == N_("Raw")) { - return shared_ptr (new RawImageProxy (xml, socket, log)); - } else if (xml->string_child("Type") == N_("Magick")) { - return shared_ptr (new MagickImageProxy (xml, socket, log)); + return shared_ptr (new RawImageProxy (xml, socket)); + } else if (xml->string_child("Type") == N_("FFmpeg")) { + return shared_ptr (new FFmpegImageProxy(xml, socket)); + } else if (xml->string_child("Type") == N_("J2K")) { + return shared_ptr (new J2KImageProxy (xml, socket)); } throw NetworkError (_("Unexpected image type received by server"));