/*
- Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
+#include "font.h"
+#include "text_content.h"
#include <dcp/interop_subtitle_asset.h>
#include <dcp/load_font_node.h>
#include <iostream>
+
using std::cout;
using std::list;
-using std::map;
using std::string;
using std::vector;
using std::shared_ptr;
using std::dynamic_pointer_cast;
-using boost::bind;
+using std::make_shared;
using namespace dcpomatic;
+
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
: Decoder (film)
{
- shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+ /* Load the XML or MXF file */
+ shared_ptr<dcp::SubtitleAsset> const c = load (content->path(0));
c->fix_empty_font_ids ();
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
if (_next != _subtitles.end()) {
first = content_time_period(*_next).from;
}
- text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
-
- map<string, dcp::ArrayData> fm = c->font_data();
- for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
- _fonts.push_back (FontData(j->first, j->second));
+ text.push_back (make_shared<TextDecoder>(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<shared_ptr<dcpomatic::Font>> 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();
- /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+ /* Find a font for each <LoadFont> Node */
for (auto i: c->load_font_nodes()) {
- if (fm.find(i->id) == fm.end()) {
+ 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)
{
Decoder::seek (time, accurate);
_next = _subtitles.begin ();
- list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+ auto i = _subtitles.begin ();
while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
++i;
}
}
+
bool
DCPSubtitleDecoder::pass ()
{
list<dcp::SubtitleString> s;
list<dcp::SubtitleImage> i;
- ContentTimePeriod const p = content_time_period (*_next);
+ auto const p = content_time_period (*_next);
while (_next != _subtitles.end () && content_time_period (*_next) == p) {
- shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+ auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
if (ns) {
s.push_back (*ns);
++_next;
this would need to be done both here and in DCPDecoder.
*/
- shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+ auto ni = dynamic_pointer_cast<const dcp::SubtitleImage>(*_next);
if (ni) {
emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
++_next;
return false;
}
+
ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
{
- return ContentTimePeriod (
- ContentTime::from_seconds (s->in().as_seconds ()),
- ContentTime::from_seconds (s->out().as_seconds ())
- );
+ return {
+ ContentTime::from_seconds(s->in().as_seconds()),
+ ContentTime::from_seconds(s->out().as_seconds())
+ };
}