X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=d8f482a3b3bcc63c38dac6264b86910cf0bfe8bc;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=15c20d8741b1ca4004c8b12600560762831d4f96;hpb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;p=dcpomatic.git diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 15c20d874..d8f482a3b 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -1,74 +1,70 @@ /* - Copyright (C) 2013-2015 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 "image_content.h" -#include "video_content.h" -#include "image_examiner.h" + #include "compose.hpp" +#include "exceptions.h" #include "film.h" -#include "job.h" #include "frame_rate_change.h" -#include "exceptions.h" -#include "safe_stringstream.h" +#include "image_content.h" +#include "image_examiner.h" #include "image_filename_sorter.h" +#include "job.h" +#include "video_content.h" #include #include -#include #include #include "i18n.h" -using std::string; + using std::cout; -using boost::shared_ptr; +using std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; +using namespace dcpomatic; -ImageContent::ImageContent (shared_ptr film, boost::filesystem::path p) - : Content (film) + +ImageContent::ImageContent (boost::filesystem::path p) { - video.reset (new VideoContent (this, film)); + video = make_shared(this); if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) { - _paths.push_back (p); + add_path (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 ()); - } - } - - if (_paths.empty()) { - throw FileError (_("No valid image files were found in the folder."), p); - } - - sort (_paths.begin(), _paths.end(), ImageFilenameSorter ()); + _path_to_scan = p; } set_default_colour_conversion (); } -ImageContent::ImageContent (shared_ptr film, cxml::ConstNodePtr node, int version) - : Content (film, node) +ImageContent::ImageContent (cxml::ConstNodePtr node, int version) + : Content (node) { - video = VideoContent::from_xml (this, film, node, version); + video = VideoContent::from_xml (this, node, version, VideoRange::FULL); } + string ImageContent::summary () const { @@ -83,6 +79,7 @@ ImageContent::summary () const return s; } + string ImageContent::technical_summary () const { @@ -98,56 +95,87 @@ ImageContent::technical_summary () const return s; } + 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); - video->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) { - Content::examine (job); + if (_path_to_scan) { + job->sub (_("Scanning image files")); + vector paths; + int n = 0; + for (auto i: boost::filesystem::directory_iterator(*_path_to_scan)) { + 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 (); - DCPOMATIC_ASSERT (film); + 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); + } - shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); + Content::examine (film, job); + + auto examiner = make_shared(film, shared_from_this(), job); video->take_from_examiner (examiner); set_default_colour_conversion (); } + +DCPTime +ImageContent::full_length (shared_ptr film) const +{ + FrameRateChange const frc (film, shared_from_this()); + return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate()); +} + + DCPTime -ImageContent::full_length () const +ImageContent::approximate_length () const { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - 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 ()); + return DCPTime::from_frames (video->length_after_3d_combine(), 24); } + string ImageContent::identifier () const { - SafeStringStream s; - s << Content::identifier(); - s << "_" << video->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 ImageContent::still () const { return number_of_paths() == 1; } + void ImageContent::set_default_colour_conversion () { - BOOST_FOREACH (boost::filesystem::path i, _paths) { + for (auto i: paths()) { if (valid_j2k_file (i)) { /* We default to no colour conversion if we have JPEG2000 files */ video->unset_colour_conversion (); @@ -165,3 +193,11 @@ ImageContent::set_default_colour_conversion () 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); +}