X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=1515c8b7618522a50c0a7be5e521e6484dda3f98;hp=915da7beba33b70687e0536d751d4e8e6e96a65f;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=9a2b45caa81d8fb056802dfe3c25f214e808ffdf diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 915da7beb..1515c8b76 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -1,65 +1,63 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2018 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 "config.h" #include "compose.hpp" #include "film.h" #include "job.h" #include "frame_rate_change.h" -#include "safe_stringstream.h" +#include "exceptions.h" +#include "image_filename_sorter.h" +#include +#include +#include +#include #include "i18n.h" using std::string; using std::cout; +using std::list; +using std::vector; using boost::shared_ptr; -ImageContent::ImageContent (shared_ptr f, boost::filesystem::path p) - : Content (f) - , VideoContent (f) +ImageContent::ImageContent (boost::filesystem::path p) { - if (boost::filesystem::is_regular_file (p)) { - _paths.push_back (p); - } 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 ()); - } - } + video.reset (new VideoContent (this)); - if (_paths.empty()) { - throw FileError (_("No valid image files were found in the folder."), p); - } - - sort (_paths.begin(), _paths.end()); + if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) { + add_path (p); + } else { + _path_to_scan = p; } + + set_default_colour_conversion (); } -ImageContent::ImageContent (shared_ptr f, shared_ptr node, int version) - : Content (f, node) - , VideoContent (f, node, version) +ImageContent::ImageContent (cxml::ConstNodePtr node, int version) + : Content (node) { - + video = VideoContent::from_xml (this, node, version); } string @@ -80,7 +78,7 @@ string ImageContent::technical_summary () const { string s = Content::technical_summary() + " - " - + VideoContent::technical_summary() + " - "; + + video->technical_summary() + " - "; if (still ()) { s += _("still"); @@ -92,56 +90,67 @@ ImageContent::technical_summary () const } void -ImageContent::as_xml (xmlpp::Node* node) const +ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const { node->add_child("Type")->add_child_text ("Image"); - Content::as_xml (node); - VideoContent::as_xml (node); + Content::as_xml (node, with_paths); + + if (video) { + video->as_xml (node); + } } void -ImageContent::examine (shared_ptr job) +ImageContent::examine (shared_ptr film, shared_ptr job) { - job->sub (_("Computing digest")); - Content::examine (job); + if (_path_to_scan) { + job->sub (_("Scanning image files")); + vector paths; + int n = 0; + for (boost::filesystem::directory_iterator i(*_path_to_scan); i != boost::filesystem::directory_iterator(); ++i) { + if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) { + paths.push_back (i->path()); + } + ++n; + if ((n % 1000) == 0) { + job->set_progress_unknown (); + } + } - shared_ptr film = _film.lock (); - assert (film); - - shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); + if (paths.empty()) { + throw FileError (_("No valid image files were found in the folder."), *_path_to_scan); + } + + sort (paths.begin(), paths.end(), ImageFilenameSorter()); + set_paths (paths); + } + + Content::examine (film, job); - take_from_video_examiner (examiner); - set_video_length (examiner->video_length ()); + shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); + video->take_from_examiner (examiner); + set_default_colour_conversion (); } -void -ImageContent::set_video_length (VideoContent::Frame len) +DCPTime +ImageContent::full_length (shared_ptr film) const { - { - boost::mutex::scoped_lock lm (_mutex); - _video_length = len; - } - - signal_changed (ContentProperty::LENGTH); + FrameRateChange const frc (film, shared_from_this()); + return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate()); } -Time -ImageContent::full_length () const +DCPTime +ImageContent::approximate_length () const { - shared_ptr film = _film.lock (); - assert (film); - - FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); - return video_length_after_3d_combine() * frc.factor() * TIME_HZ / video_frame_rate(); + return DCPTime::from_frames (video->length_after_3d_combine(), 24); } string ImageContent::identifier () const { - SafeStringStream s; - s << VideoContent::identifier (); - s << "_" << video_length(); - return s.str (); + char buffer[256]; + snprintf (buffer, sizeof(buffer), "%s_%s_%" PRId64, Content::identifier().c_str(), video->identifier().c_str(), video->length()); + return buffer; } bool @@ -151,17 +160,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 (shared_ptr film, list& p) const +{ + Content::add_properties (film, p); + video->add_properties (p); +}