/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
+
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
-#include <dcp/interop_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;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
- : SubtitleDecoder (content)
+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 std::make_shared;
+using boost::bind;
+using namespace dcpomatic;
+
+
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+ : Decoder (film)
{
- dcp::InteropSubtitleContent c (content->path (0));
- _subtitles = c.subtitles ();
+ auto 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<TextDecoder>(this, content->only_text(), first));
+
+ auto fm = c->font_data();
+ for (auto const& i: fm) {
+ _fonts.push_back (FontData(i.first, i.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 (ContentTime time, bool accurate)
{
- SubtitleDecoder::seek (time, accurate);
+ Decoder::seek (time, accurate);
_next = _subtitles.begin ();
- list<dcp::SubtitleString>::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 ()
{
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<dcp::SubtitleString> s;
- s.push_back (*_next);
- text_subtitle (s);
- ++_next;
+ list<dcp::SubtitleImage> i;
+ auto const p = content_time_period (*_next);
+
+ while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+ 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;
+ }
+ }
+ }
+ only_text()->emit_plain (p, s);
return false;
}
-list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
{
- /* XXX: inefficient */
-
- list<ContentTimePeriod> d;
-
- for (list<dcp::SubtitleString>::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<dcpomatic::FontData>
+DCPSubtitleDecoder::fonts () const
+{
+ return _fonts;
}
projects / dcpomatic.git / blobdiff