X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.cc;h=ba47e1231067f917e2ada7e160c3c2e21302aa94;hb=7245e46453a82886739a45bd78fcdf9e8401367c;hp=2daa5086dda6c2a529c4420f4fb8c5f0525be99e;hpb=f75abce28a26c550d156ceb012b0f083ac2068b0;p=dcpomatic.git diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc index 2daa5086d..ba47e1231 100644 --- a/src/lib/subtitle_encoder.cc +++ b/src/lib/subtitle_encoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019 Carl Hetherington + Copyright (C) 2019-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,30 +18,42 @@ */ -#include "subtitle_encoder.h" -#include "player.h" + #include "compose.hpp" +#include "font_data.h" #include "job.h" +#include "player.h" +#include "subtitle_encoder.h" #include #include #include -#include #include -#include +#include #include "i18n.h" -using std::string; + using std::make_pair; +using std::make_shared; using std::pair; +using std::shared_ptr; +using std::string; using std::vector; -using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; -SubtitleEncoder::SubtitleEncoder (shared_ptr film, shared_ptr job, boost::filesystem::path output, bool split_reels) + +/** @param output Directory, if there will be multiple output files, or a filename. + * @param initial_name Hint that may be used to create filenames, if @ref output is a directory. + * @param include_font true to refer to and export any font file (for Interop; ignored for SMPTE). + */ +SubtitleEncoder::SubtitleEncoder (shared_ptr film, shared_ptr job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font) : Encoder (film, job) , _split_reels (split_reels) + , _include_font (include_font) , _reel_index (0) , _length (film->length()) { @@ -50,27 +62,33 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr film, shared_ptr j _player->set_ignore_audio (); _player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4)); + string const extension = film->interop() ? ".xml" : ".mxf"; + int const files = split_reels ? film->reels().size() : 1; for (int i = 0; i < files; ++i) { boost::filesystem::path filename = output; - string extension = boost::filesystem::extension (filename); - filename = boost::filesystem::change_extension (filename, ""); - - if (files > 1) { - /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate - /// which reel it is. Preserve the %1; it will be replaced with the reel number. - filename = filename.string() + String::compose(_("_reel%1"), i + 1); + if (boost::filesystem::is_directory(filename)) { + if (files > 1) { + /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate + /// which reel it is. Preserve the %1; it will be replaced with the reel number. + filename /= String::compose("%1_reel%2", initial_name, i + 1); + } else { + filename /= initial_name; + } } - _assets.push_back (make_pair(shared_ptr(), boost::filesystem::change_extension(filename, ".xml"))); + _assets.push_back (make_pair(shared_ptr(), boost::filesystem::change_extension(filename, extension))); } - BOOST_FOREACH (dcpomatic::DCPTimePeriod i, film->reels()) { + for (auto i: film->reels()) { _reels.push_back (i); } + + _default_font = dcp::ArrayData (default_font_file()); } + void SubtitleEncoder::go () { @@ -85,50 +103,59 @@ SubtitleEncoder::go () while (!_player->pass()) {} int reel = 0; - for (vector, boost::filesystem::path> >::iterator i = _assets.begin(); i != _assets.end(); ++i) { - if (!i->first) { + for (auto& i: _assets) { + if (!i.first) { /* No subtitles arrived for this asset; make an empty one so we write something to the output */ if (_film->interop()) { - shared_ptr s (new dcp::InteropSubtitleAsset()); + auto s = make_shared(); s->set_movie_title (_film->name()); s->set_reel_number (raw_convert(reel + 1)); - i->first = s; + i.first = s; } else { - shared_ptr s (new dcp::SMPTESubtitleAsset()); + auto s = make_shared(); s->set_content_title_text (_film->name()); s->set_reel_number (reel + 1); - i->first = s; + i.first = s; + } + } + + if (!_film->interop() || _include_font) { + for (auto j: _player->get_subtitle_fonts()) { + i.first->add_font (j.id, _default_font); } } - i->first->write (i->second); + i.first->write (i.second); ++reel; } } + void SubtitleEncoder::text (PlayerText subs, TextType type, optional track, dcpomatic::DCPTimePeriod period) { - if (type != TEXT_OPEN_SUBTITLE) { + if (type != TextType::OPEN_SUBTITLE) { return; } if (!_assets[_reel_index].first) { shared_ptr asset; - string lang = _film->subtitle_language (); + auto lang = _film->subtitle_languages (); if (_film->interop ()) { - shared_ptr s (new dcp::InteropSubtitleAsset()); + auto s = make_shared(); s->set_movie_title (_film->name()); - s->set_language (lang.empty() ? "Unknown" : lang); + if (lang.first) { + s->set_language (lang.first->to_string()); + } s->set_reel_number (raw_convert(_reel_index + 1)); _assets[_reel_index].first = s; } else { - shared_ptr s (new dcp::SMPTESubtitleAsset()); + auto s = make_shared(); s->set_content_title_text (_film->name()); - if (!lang.empty()) { - s->set_language (lang); - } else { - s->set_language (track->language); + if (lang.first) { + s->set_language (*lang.first); + } else if (track->language) { + s->set_language (track->language.get()); } s->set_edit_rate (dcp::Fraction (_film->video_frame_rate(), 1)); s->set_reel_number (_reel_index + 1); @@ -141,11 +168,14 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional tr } } - BOOST_FOREACH (StringText i, subs.string) { + for (auto i: subs.string) { /* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */ i.set_in (i.in()); i.set_out (i.out()); - _assets[_reel_index].first->add (shared_ptr(new dcp::SubtitleString(i))); + if (_film->interop() && !_include_font) { + i.unset_font (); + } + _assets[_reel_index].first->add (make_shared(i)); } if (_split_reels && (_reel_index < int(_reels.size()) - 1) && period.from > _reels[_reel_index].from) { @@ -154,12 +184,13 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional tr _last = period.from; - shared_ptr job = _job.lock (); + auto job = _job.lock (); if (job) { job->set_progress (float(period.from.get()) / _length.get()); } } + Frame SubtitleEncoder::frames_done () const {