X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=169a41751a6860929be63912d6356b040e42c695;hp=20a9f32fee031ddd99fc03f19ab1d5182614e6f7;hb=7647290fbaa81e25875758597f7cbbeca19f80bc;hpb=1f82930e73679d6aec5223caa255f564339a1a2a diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc index 20a9f32fe..169a41751 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -1,50 +1,110 @@ /* - Copyright (C) 2014 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 + #include "dcp_subtitle_decoder.h" #include "dcp_subtitle_content.h" +#include "font.h" +#include "text_content.h" +#include +#include +#include + -using std::list; using std::cout; -using boost::shared_ptr; +using std::list; +using std::string; +using std::vector; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::make_shared; +using namespace dcpomatic; + -DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr content) - : SubtitleDecoder (content) +DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr film, shared_ptr content) + : Decoder (film) { - dcp::SubtitleContent c (content->path (0), false); - _subtitles = c.subtitles (); + /* Load the XML or MXF file */ + shared_ptr const c = load (content->path(0)); + c->fix_empty_font_ids (); + _subtitles = c->subtitles (); _next = _subtitles.begin (); + + ContentTime first; + if (_next != _subtitles.end()) { + first = content_time_period(*_next).from; + } + text.push_back (make_shared(this, content->only_text(), first)); + + /* The fonts that are included in content's file; if it's interop there will be none + * (as the fonts are held in separate assets). + */ + auto fonts_in_asset = c->font_data(); + + /* Fonts specified in the TextContent */ + list> fonts_in_content; + for (auto i: content->text) { + auto this_fonts = i->fonts(); + std::copy(this_fonts.begin(), this_fonts.end(), std::back_inserter(fonts_in_content)); + } + fonts_in_content.sort(); + fonts_in_content.unique(); + + /* Find a font for each Node */ + for (auto i: c->load_font_nodes()) { + bool done = false; + for (auto j: fonts_in_content) { + if (j->id() == i->id && j->file()) { + // One was specified in the content + _fonts.push_back (FontData(i->id, dcp::ArrayData(*j->file()))); + done = true; + } + } + if (!done) { + if (fonts_in_asset.find(i->id) != fonts_in_asset.end()) { + // One was included in the subtitle file + _fonts.push_back (FontData(i->id, fonts_in_asset[i->id])); + done = true; + } + } + if (!done) { + // Give up and add a default + _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file()))); + } + } } + void DCPSubtitleDecoder::seek (ContentTime time, bool accurate) { - SubtitleDecoder::seek (time, accurate); + Decoder::seek (time, accurate); _next = _subtitles.begin (); - list::const_iterator i = _subtitles.begin (); - while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().to_seconds()) < time) { + auto i = _subtitles.begin (); + while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) { ++i; } } + bool DCPSubtitleDecoder::pass () { @@ -52,32 +112,53 @@ DCPSubtitleDecoder::pass () return true; } + /* Gather all subtitles with the same time period that are next + on the list. We must emit all subtitles for the same time + period with the same emit*() call otherwise the + TextDecoder will assume there is nothing else at the + time of emitting the first. + */ + list s; - s.push_back (*_next); - text_subtitle (s); - ++_next; + list i; + auto const p = content_time_period (*_next); + + while (_next != _subtitles.end () && content_time_period (*_next) == p) { + auto ns = dynamic_pointer_cast(*_next); + if (ns) { + s.push_back (*ns); + ++_next; + } else { + /* XXX: perhaps these image subs should also be collected together like the string ones are; + this would need to be done both here and in DCPDecoder. + */ + + auto ni = dynamic_pointer_cast(*_next); + if (ni) { + emit_subtitle_image (p, *ni, film()->frame_size(), only_text()); + ++_next; + } + } + } + only_text()->emit_plain (p, s); return false; } -list -DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const + +ContentTimePeriod +DCPSubtitleDecoder::content_time_period (shared_ptr s) const { - /* XXX: inefficient */ - - list d; - - for (list::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) { - ContentTimePeriod period ( - ContentTime::from_seconds (i->in().to_seconds ()), - ContentTime::from_seconds (i->out().to_seconds ()) - ); - - if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) { - d.push_back (period); - } - } + return { + ContentTime::from_seconds(s->in().as_seconds()), + ContentTime::from_seconds(s->out().as_seconds()) + }; +} + - return d; +vector +DCPSubtitleDecoder::fonts () const +{ + return _fonts; }