X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=8de5967efb51421d64240fec484a43da786cbbc8;hb=3144a348751dc0c91ba1d1c7fe6c90127de9ef21;hp=45c4be9b21bad8e8148154ad4491f0d345e3d4f6;hpb=8af00f5e0862c18e8c7b5f9ac0ea95a5d6ad696c;p=dcpomatic.git diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 45c4be9b2..8de5967ef 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -1,76 +1,127 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2021 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 "font.h" #include "dcp_subtitle_content.h" -#include -#include -#include +#include "film.h" +#include "font_id_allocator.h" +#include "text_content.h" #include +#include +#include +#include +#include #include "i18n.h" -using std::string; +using std::dynamic_pointer_cast; using std::list; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; +using std::string; using dcp::raw_convert; +using namespace dcpomatic; -DCPSubtitleContent::DCPSubtitleContent (shared_ptr film, boost::filesystem::path path) - : Content (film, path) - , SubtitleContent (film, path) +DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path) + : Content (path) { - + text.push_back (make_shared(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE)); } -DCPSubtitleContent::DCPSubtitleContent (shared_ptr film, cxml::ConstNodePtr node, int version) - : Content (film, node) - , SubtitleContent (film, node, version) - , _length (node->number_child ("Length")) +DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version) + : Content (node) + , _length (node->number_child ("Length")) { - + list notes; + text = TextContent::from_xml (this, node, version, notes); } void -DCPSubtitleContent::examine (shared_ptr job, bool calculate_digest) +DCPSubtitleContent::examine (shared_ptr film, shared_ptr job) { - Content::examine (job, calculate_digest); + Content::examine (film, job); + + auto subtitle_asset = load(path(0)); + + auto iop = dynamic_pointer_cast(subtitle_asset); + auto smpte = dynamic_pointer_cast(subtitle_asset); + if (smpte) { + set_video_frame_rate(film, smpte->edit_rate().numerator); + } - shared_ptr sc = load (path (0)); - boost::mutex::scoped_lock lm (_mutex); - - _subtitle_language = sc->language (); - _length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ()); - list > fonts = sc->load_font_nodes (); - for (list >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - _fonts.push_back (shared_ptr (new Font ((*i)->id))); + /* Default to turning these subtitles on */ + only_text()->set_use (true); + + _length = ContentTime::from_seconds(subtitle_asset->latest_subtitle_out().as_seconds()); + + subtitle_asset->fix_empty_font_ids(); + add_fonts(only_text(), subtitle_asset); +} + + +void +DCPSubtitleContent::add_fonts(shared_ptr content, shared_ptr subtitle_asset) +{ + FontIDAllocator font_id_allocator; + + for (auto node: subtitle_asset->load_font_nodes()) { + font_id_allocator.add_font(0, subtitle_asset->id(), node->id); + } + font_id_allocator.allocate(); + + auto font_data = subtitle_asset->font_data(); + for (auto node: subtitle_asset->load_font_nodes()) { + auto data = font_data.find(node->id); + shared_ptr font; + if (data != font_data.end()) { + font = make_shared( + font_id_allocator.font_id(0, subtitle_asset->id(), node->id), + data->second + ); + } else { + font = make_shared( + font_id_allocator.font_id(0, subtitle_asset->id(), node->id) + ); + } + content->add_font(font); + } + + if (!font_id_allocator.has_default_font()) { + content->add_font(make_shared(font_id_allocator.default_font_id(), default_font_file())); } } + DCPTime -DCPSubtitleContent::full_length () const +DCPSubtitleContent::full_length (shared_ptr film) const { - /* XXX: this assumes that the timing of the subtitle file is appropriate - for the DCP's frame rate. - */ - return _length; + FrameRateChange const frc (film, shared_from_this()); + return DCPTime (_length, frc); +} + +DCPTime +DCPSubtitleContent::approximate_length () const +{ + return DCPTime (_length, FrameRateChange()); } string @@ -84,12 +135,16 @@ DCPSubtitleContent::technical_summary () const { return Content::technical_summary() + " - " + _("DCP XML subtitles"); } - + void -DCPSubtitleContent::as_xml (xmlpp::Node* node) const +DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const { node->add_child("Type")->add_child_text ("DCPSubtitle"); - Content::as_xml (node); - SubtitleContent::as_xml (node); + Content::as_xml (node, with_paths); + + if (only_text()) { + only_text()->as_xml (node); + } + node->add_child("Length")->add_child_text (raw_convert (_length.get ())); }