X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=24ad9557807416624eb0e083663ad1691fd2ab46;hp=911527384f90fc27e2afdaad069f21a5d9f96fcf;hb=c1f98c84cdf3829b31929453b8a89fdcbdcd0c42;hpb=d15e78baea5b9df87019cd6be1b58a1b949af5c2 diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 911527384..24ad95578 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -1,19 +1,20 @@ /* - 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 . */ @@ -22,19 +23,31 @@ */ #include "ffmpeg_content.h" +#include "audio_content.h" #include "image_content.h" -#include "sndfile_content.h" -#include "text_subtitle_content.h" +#include "atmos_mxf_content.h" +#include "plain_text_content.h" #include "dcp_content.h" -#include "dcp_subtitle_content.h" +#include "dcp_text_content.h" #include "util.h" +#include "ffmpeg_audio_stream.h" +#include "video_mxf_content.h" +#include "film.h" +#include "log_entry.h" +#include "log.h" +#include "compose.hpp" #include #include #include +#include "i18n.h" + using std::string; using std::list; using boost::shared_ptr; +using boost::optional; + +#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); /** Create a Content object from an XML node. * @param film Film that the content will be in. @@ -51,92 +64,173 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l boost::shared_ptr content; if (type == "FFmpeg") { + /* SndfileContent is now handled by the FFmpeg code rather than by + separate libsndfile-based code. + */ content.reset (new FFmpegContent (film, node, version, notes)); } else if (type == "Image") { content.reset (new ImageContent (film, node, version)); } else if (type == "Sndfile") { - content.reset (new SndfileContent (film, node, version)); + /* SndfileContent is now handled by the FFmpeg code rather than by + separate libsndfile-based code. + */ + content.reset (new FFmpegContent (film, node, version, notes)); + + content->audio->set_stream ( + AudioStreamPtr ( + new FFmpegAudioStream ( + "Stream", 0, + node->number_child ("AudioFrameRate"), + node->number_child ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) + ) + ) + ); + } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new TextSubtitleContent (film, node, version)); + content.reset (new PlainText (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { - content.reset (new DCPSubtitleContent (film, node, version)); + content.reset (new DCPTextContent (film, node, version)); + } else if (type == "VideoMXF") { + content.reset (new VideoMXFContent (film, node, version)); + } else if (type == "AtmosMXF") { + content.reset (new AtmosMXFContent (film, node, version)); + } + + /* See if this content should be nudged to start on a video frame */ + DCPTime const old_pos = content->position(); + content->set_position(old_pos); + if (old_pos != content->position()) { + string note = _("Your project contains video content that was not aligned to a frame boundary."); + note += " "; + if (old_pos < content->position()) { + note += String::compose( + _("The file %1 has been moved %2 milliseconds later."), + content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000 + ); + } else { + note += String::compose( + _("The file %1 has been moved %2 milliseconds earlier."), + content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000 + ); + } + notes.push_back (note); + } + + /* ...or have a start trim which is an integer number of frames */ + ContentTime const old_trim = content->trim_start(); + content->set_trim_start(old_trim); + if (old_trim != content->trim_start()) { + string note = _("Your project contains video content whose trim was not aligned to a frame boundary."); + note += " "; + if (old_trim < content->trim_start()) { + note += String::compose( + _("The file %1 has been trimmed by %2 milliseconds more."), + content->path_summary(), ContentTime(content->trim_start() - old_trim).seconds() * 1000 + ); + } else { + note += String::compose( + _("The file %1 has been trimmed by %2 milliseconds less."), + content->path_summary(), ContentTime(old_trim - content->trim_start()).seconds() * 1000 + ); + } + notes.push_back (note); } return content; } -/** Create a Content object from a file or directory. +/** Create some Content objects from a file or directory. * @param film Film that the content will be in. * @param path File or directory. - * @return Content object. + * @return Content objects. */ -shared_ptr +list > content_factory (shared_ptr film, boost::filesystem::path path) { - shared_ptr content; + list > content; if (boost::filesystem::is_directory (path)) { + LOG_GENERAL ("Look in directory %1", path); + if (boost::filesystem::is_empty (path)) { - return shared_ptr (); + return content; } - /* Guess if this is a DCP or a set of images: read the first ten filenames and if they - are all valid image files we assume it is a set of images. - */ + /* See if this is a set of images or a set of sound files */ - bool is_dcp = false; + int image_files = 0; + int sound_files = 0; int read = 0; for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) { - if (boost::starts_with (i->path().leaf().string(), "._")) { - /* We ignore these files */ + LOG_GENERAL ("Checking file %1", i->path()); + + if (boost::starts_with (i->path().leaf().string(), ".")) { + /* We ignore hidden files */ + LOG_GENERAL ("Ignored %1 (starts with .)", i->path()); continue; } if (!boost::filesystem::is_regular_file(i->path())) { /* Ignore things which aren't files (probably directories) */ + LOG_GENERAL ("Ignored %1 (not a regular file)", i->path()); continue; } - if (!valid_image_file (i->path())) { - /* We have a normal file which isn't an image; assume we are looking - at a DCP. - */ - is_dcp = true; + if (valid_image_file (i->path ())) { + ++image_files; + } + + if (valid_sound_file (i->path ())) { + ++sound_files; } ++read; } - if (is_dcp) { - content.reset (new DCPContent (film, path)); - } else { - content.reset (new ImageContent (film, path)); + if (image_files > 0 && sound_files == 0) { + content.push_back (shared_ptr (new ImageContent (film, path))); + } else if (image_files == 0 && sound_files > 0) { + for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator(); ++i) { + content.push_back (shared_ptr (new FFmpegContent (film, i->path()))); + } } } else { + shared_ptr single; + string ext = path.extension().string (); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); if (valid_image_file (path)) { - content.reset (new ImageContent (film, path)); - } else if (SndfileContent::valid_file (path)) { - content.reset (new SndfileContent (film, path)); - } else if (ext == ".srt" || ext == ".ssa") { - content.reset (new TextSubtitleContent (film, path)); + single.reset (new ImageContent (film, path)); + } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") { + single.reset (new PlainText (film, path)); } else if (ext == ".xml") { - content.reset (new DCPSubtitleContent (film, path)); + cxml::Document doc; + doc.read_file (path); + if (doc.root_name() == "DCinemaSecurityMessage") { + throw KDMAsContentError (); + } + single.reset (new DCPTextContent (film, path)); } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - content.reset (new DCPSubtitleContent (film, path)); + single.reset (new DCPTextContent (film, path)); + } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { + single.reset (new VideoMXFContent (film, path)); + } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { + single.reset (new AtmosMXFContent (film, path)); } - if (!content) { - content.reset (new FFmpegContent (film, path)); + if (!single) { + single.reset (new FFmpegContent (film, path)); } + + content.push_back (single); } return content;