From: Carl Hetherington Date: Fri, 7 Nov 2014 22:33:37 +0000 (+0000) Subject: Remove log from ImageProxy hierarchy. X-Git-Tag: v2.0.48~496^2 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=87da92b45a9a0cf4ce809ea580a78c4dd5d96021 Remove log from ImageProxy hierarchy. --- diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index bf016ef87..adeadd98a 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -38,11 +38,10 @@ using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log) +DCPDecoder::DCPDecoder (shared_ptr c) : VideoDecoder (c) , AudioDecoder (c) , SubtitleDecoder (c) - , _log (log) , _dcp_content (c) { dcp::DCP dcp (c->directory ()); @@ -71,15 +70,15 @@ DCPDecoder::pass () shared_ptr stereo = dynamic_pointer_cast (mxf); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (mono) { - video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame); + video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size())), frame); } else { video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT)), frame ); video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT)), frame ); } diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index d81b20b5c..89931aa38 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -31,7 +31,7 @@ class Log; class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder { public: - DCPDecoder (boost::shared_ptr, boost::shared_ptr); + DCPDecoder (boost::shared_ptr); private: void seek (ContentTime t, bool accurate); @@ -41,6 +41,5 @@ private: ContentTime _next; std::list > _reels; std::list >::iterator _reel; - boost::shared_ptr _log; boost::shared_ptr _dcp_content; }; diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index a96a4fb40..e90c33c80 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -401,7 +401,7 @@ FFmpegDecoder::decode_video_packet () if (i->second != AV_NOPTS_VALUE) { double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); video ( - shared_ptr (new RawImageProxy (image, _video_content->film()->log())), + shared_ptr (new RawImageProxy (image)), rint (pts * _ffmpeg_content->video_frame_rate ()) ); } else { diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index 8702c1a33..53ef7bae7 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -49,7 +49,7 @@ ImageDecoder::pass () if (!_image_content->still() || !_image) { /* Either we need an image or we are using moving images, so load one */ - _image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ())); + _image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position))); } video (_image, _video_position); diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index b6b387b76..7013a69c9 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -26,31 +26,22 @@ #include "image.h" #include "exceptions.h" #include "cross.h" -#include "log.h" #include "i18n.h" -#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); - using std::cout; using std::string; using boost::shared_ptr; -ImageProxy::ImageProxy (shared_ptr log) - : _log (log) -{ - -} - 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)); + return shared_ptr (new RawImageProxy (xml, socket)); } else if (xml->string_child("Type") == N_("Magick")) { - return shared_ptr (new MagickImageProxy (xml, socket, log)); + return shared_ptr (new MagickImageProxy (xml, socket)); } else if (xml->string_child("Type") == N_("J2K")) { - return shared_ptr (new J2KImageProxy (xml, socket, log)); + return shared_ptr (new J2KImageProxy (xml, socket)); } throw NetworkError (_("Unexpected image type received by server")); diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h index 7ff28e174..79b2bf4e8 100644 --- a/src/lib/image_proxy.h +++ b/src/lib/image_proxy.h @@ -31,7 +31,6 @@ class Image; class Socket; -class Log; namespace cxml { class Node; @@ -56,7 +55,6 @@ namespace dcp { class ImageProxy : public boost::noncopyable { public: - ImageProxy (boost::shared_ptr log); virtual ~ImageProxy () {} /** @return Image (which must be aligned) */ @@ -67,11 +65,8 @@ public: virtual bool same (boost::shared_ptr) const { return false; } - -protected: - boost::shared_ptr _log; }; -boost::shared_ptr image_proxy_factory (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); +boost::shared_ptr image_proxy_factory (boost::shared_ptr xml, boost::shared_ptr socket); #endif diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 6924fad79..1fe854cd1 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -31,25 +31,22 @@ using std::string; using boost::shared_ptr; -J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, shared_ptr log) - : ImageProxy (log) - , _mono (frame) +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size) + : _mono (frame) , _size (size) { } -J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, dcp::Eye eye, shared_ptr log) - : ImageProxy (log) - , _stereo (frame) +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, dcp::Eye eye) + : _stereo (frame) , _size (size) , _eye (eye) { } -J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr socket, shared_ptr log) - : ImageProxy (log) +J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr socket) { _size = dcp::Size (xml->number_child ("Width"), xml->number_child ("Height")); if (xml->optional_number_child ("Eye")) { diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index d7b5c83fc..c931e5644 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -25,9 +25,9 @@ class EncodedData; class J2KImageProxy : public ImageProxy { public: - J2KImageProxy (boost::shared_ptr frame, dcp::Size, boost::shared_ptr log); - J2KImageProxy (boost::shared_ptr frame, dcp::Size, dcp::Eye, boost::shared_ptr log); - J2KImageProxy (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); + J2KImageProxy (boost::shared_ptr frame, dcp::Size); + J2KImageProxy (boost::shared_ptr frame, dcp::Size, dcp::Eye); + J2KImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); boost::shared_ptr image () const; void add_metadata (xmlpp::Node *) const; diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc index d1aa890b7..e71ee4284 100644 --- a/src/lib/magick_image_proxy.cc +++ b/src/lib/magick_image_proxy.cc @@ -22,21 +22,16 @@ #include "cross.h" #include "exceptions.h" #include "util.h" -#include "log.h" #include "image.h" -#include "log.h" #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::dynamic_pointer_cast; -MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr log) - : ImageProxy (log) +MagickImageProxy::MagickImageProxy (boost::filesystem::path path) { /* Read the file into a Blob */ @@ -57,8 +52,7 @@ MagickImageProxy::MagickImageProxy (boost::filesystem::path path, 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]; @@ -74,8 +68,6 @@ MagickImageProxy::image () const 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,7 +96,6 @@ 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)); @@ -122,8 +113,6 @@ MagickImageProxy::image () const delete magick_image; - LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length()); - return _image; } diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h index 8b43d0a00..632fde8c7 100644 --- a/src/lib/magick_image_proxy.h +++ b/src/lib/magick_image_proxy.h @@ -22,8 +22,8 @@ class MagickImageProxy : public ImageProxy { public: - MagickImageProxy (boost::filesystem::path, boost::shared_ptr log); - MagickImageProxy (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); + MagickImageProxy (boost::filesystem::path); + MagickImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); boost::shared_ptr image () const; void add_metadata (xmlpp::Node *) const; diff --git a/src/lib/player.cc b/src/lib/player.cc index db99cd2ad..fabb5b211 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -128,7 +128,7 @@ Player::setup_pieces () shared_ptr dc = dynamic_pointer_cast (*i); if (dc) { - decoder.reset (new DCPDecoder (dc, _film->log ())); + decoder.reset (new DCPDecoder (dc)); frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate()); } @@ -298,7 +298,7 @@ Player::black_player_video_frame (DCPTime time) const { return shared_ptr ( new PlayerVideo ( - shared_ptr (new RawImageProxy (_black_image, _film->log ())), + shared_ptr (new RawImageProxy (_black_image)), time, Crop (), optional (), diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index b5f0b5fa5..b7a8f8669 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -57,7 +57,7 @@ PlayerVideo::PlayerVideo ( } -PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket, shared_ptr log) +PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket) { _time = DCPTime (node->number_child ("Time")); _crop = Crop (node); @@ -70,7 +70,7 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket _part = (Part) node->number_child ("Part"); _colour_conversion = ColourConversion::from_xml (node); - _in = image_proxy_factory (node->node_child ("In"), socket, log); + _in = image_proxy_factory (node->node_child ("In"), socket); if (node->optional_number_child ("SubtitleX")) { diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 610a7526c..f1d0543d7 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -30,7 +30,6 @@ class Image; class ImageProxy; class Scaler; class Socket; -class Log; class EncodedData; /** Everything needed to describe a video frame coming out of the player, but with the @@ -53,7 +52,7 @@ public: boost::optional ); - PlayerVideo (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); + PlayerVideo (boost::shared_ptr, boost::shared_ptr); void set_subtitle (PositionImage); diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc index 7e0688d13..8e8bf8824 100644 --- a/src/lib/raw_image_proxy.cc +++ b/src/lib/raw_image_proxy.cc @@ -31,15 +31,13 @@ extern "C" { using std::string; using boost::shared_ptr; -RawImageProxy::RawImageProxy (shared_ptr image, shared_ptr log) - : ImageProxy (log) - , _image (image) +RawImageProxy::RawImageProxy (shared_ptr image) + : _image (image) { } -RawImageProxy::RawImageProxy (shared_ptr xml, shared_ptr socket, shared_ptr log) - : ImageProxy (log) +RawImageProxy::RawImageProxy (shared_ptr xml, shared_ptr socket) { dcp::Size size ( xml->number_child ("Width"), xml->number_child ("Height") diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h index 6707f689c..62561c6fb 100644 --- a/src/lib/raw_image_proxy.h +++ b/src/lib/raw_image_proxy.h @@ -22,8 +22,8 @@ class RawImageProxy : public ImageProxy { public: - RawImageProxy (boost::shared_ptr, boost::shared_ptr log); - RawImageProxy (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); + RawImageProxy (boost::shared_ptr); + RawImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); boost::shared_ptr image () const; void add_metadata (xmlpp::Node *) const; diff --git a/src/lib/server.cc b/src/lib/server.cc index a699be577..3583a19c0 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -112,7 +112,7 @@ Server::process (shared_ptr socket, struct timeval& after_read, struct t return -1; } - shared_ptr pvf (new PlayerVideo (xml, socket, _log)); + shared_ptr pvf (new PlayerVideo (xml, socket)); DCPVideo dcp_video_frame (pvf, xml, _log); diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 0154200ad..0cd728165 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), optional (), @@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), optional (),