/*
- Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include <dcp/interop_subtitle_asset.h>
+#include <dcp/load_font_node.h>
#include <iostream>
-using std::list;
using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+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 namespace dcpomatic;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+ : Decoder (film)
{
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+ c->fix_empty_font_ids ();
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
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));
+ }
+
+ /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+ for (auto i: c->load_font_nodes()) {
+ if (fm.find(i->id) == fm.end()) {
+ _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
+ }
+ }
}
void
-DCPSubtitleDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool accurate)
+DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
{
- Decoder::seek (film, time, 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 (shared_ptr<const Film>)
+DCPSubtitleDecoder::pass ()
{
if (_next == _subtitles.end ()) {
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 plain_text() call otherwise the
+ period with the same emit*() call otherwise the
TextDecoder will assume there is nothing else at the
- time of emit the first.
+ time of emitting the first.
*/
list<dcp::SubtitleString> s;
+ list<dcp::SubtitleImage> i;
ContentTimePeriod 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;
+ } 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<const dcp::SubtitleImage>(*_next);
+ if (ni) {
+ emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+ ++_next;
+ }
}
-
- /* XXX: image subtitles */
}
only_text()->emit_plain (p, s);
}
ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
+{
+ return {
+ ContentTime::from_seconds(s->in().as_seconds()),
+ ContentTime::from_seconds(s->out().as_seconds())
+ };
+}
+
+
+vector<dcpomatic::FontData>
+DCPSubtitleDecoder::fonts () const
{
- return ContentTimePeriod (
- ContentTime::from_seconds (s->in().as_seconds ()),
- ContentTime::from_seconds (s->out().as_seconds ())
- );
+ return _fonts;
}
+