X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=08b9fd6ae475a364dd367f48274ef28e23ebf5d0;hp=eb8b35210efd4a2a65cd4a4e02380438b3f05ba1;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=fc45861c622ed38f479265e63abc220444e54b61 diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index eb8b35210..08b9fd6ae 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -1,77 +1,74 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 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 "image_content.h" +#include "video_content.h" #include "image_examiner.h" #include "compose.hpp" #include "film.h" #include "job.h" #include "frame_rate_change.h" #include "exceptions.h" -#include "safe_stringstream.h" +#include "image_filename_sorter.h" +#include +#include +#include +#include +#include #include "i18n.h" using std::string; using std::cout; +using std::list; using boost::shared_ptr; -ImageContent::ImageContent (shared_ptr f, boost::filesystem::path p) - : Content (f) - , VideoContent (f) +ImageContent::ImageContent (shared_ptr film, boost::filesystem::path p) + : Content (film) { - bool have_j2k = false; - if (boost::filesystem::is_regular_file (p)) { + video.reset (new VideoContent (this)); + + if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) { _paths.push_back (p); - if (valid_j2k_file (p)) { - have_j2k = true; - } } else { for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) { if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) { _paths.push_back (i->path ()); - if (valid_j2k_file (i->path ())) { - have_j2k = true; - } } } if (_paths.empty()) { throw FileError (_("No valid image files were found in the folder."), p); } - - sort (_paths.begin(), _paths.end()); - } - if (have_j2k) { - /* We default to no colour conversion if we have JPEG2000 files */ - unset_colour_conversion (false); + sort (_paths.begin(), _paths.end(), ImageFilenameSorter ()); } + + set_default_colour_conversion (); } -ImageContent::ImageContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) - , VideoContent (f, node, version) +ImageContent::ImageContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) { - + video = VideoContent::from_xml (this, node, version); } string @@ -92,7 +89,7 @@ string ImageContent::technical_summary () const { string s = Content::technical_summary() + " - " - + VideoContent::technical_summary() + " - "; + + video->technical_summary() + " - "; if (still ()) { s += _("still"); @@ -108,7 +105,10 @@ ImageContent::as_xml (xmlpp::Node* node) const { node->add_child("Type")->add_child_text ("Image"); Content::as_xml (node); - VideoContent::as_xml (node); + + if (video) { + video->as_xml (node); + } } void @@ -118,20 +118,10 @@ ImageContent::examine (shared_ptr job) shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - - shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); - take_from_video_examiner (examiner); -} - -void -ImageContent::set_video_length (ContentTime len) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _video_length = len; - } - signal_changed (ContentProperty::LENGTH); + shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); + video->take_from_examiner (examiner); + set_default_colour_conversion (); } DCPTime @@ -139,15 +129,17 @@ ImageContent::full_length () const { shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate())); + FrameRateChange const frc (active_video_frame_rate(), film->video_frame_rate()); + return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ()); } string ImageContent::identifier () const { - SafeStringStream s; - s << VideoContent::identifier (); - s << "_" << video_length().get(); + locked_stringstream s; + s << Content::identifier(); + s << "_" << video->identifier (); + s << "_" << video->length(); return s.str (); } @@ -158,17 +150,30 @@ ImageContent::still () const } void -ImageContent::set_video_frame_rate (float r) +ImageContent::set_default_colour_conversion () { - { - boost::mutex::scoped_lock lm (_mutex); - if (_video_frame_rate == r) { + BOOST_FOREACH (boost::filesystem::path i, _paths) { + if (valid_j2k_file (i)) { + /* We default to no colour conversion if we have JPEG2000 files */ + video->unset_colour_conversion (); return; } - - _video_frame_rate = r; } - - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + + bool const s = still (); + + boost::mutex::scoped_lock lm (_mutex); + + if (s) { + video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion); + } else { + video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion); + } } +void +ImageContent::add_properties (list& p) const +{ + Content::add_properties (p); + video->add_properties (p); +}