X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=78148d18f1fb4b6c301b59269f177124d1da253e;hp=2bd732d5bfbd6aae0ce9800c385c285b411000ce;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=4ba4258d1a3c89aa1ec4bdcfacb3ceec18adb6b7 diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 2bd732d5b..78148d18f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -25,33 +25,34 @@ #include "log.h" #include "dcpomatic_log.h" #include "digester.h" -#include "font.h" +#include "font_data.h" #include "compose.hpp" #include "config.h" #include "audio_buffers.h" #include "image.h" #include #include +#include +#include +#include +#include #include -#include -#include -#include +#include #include #include +#include +#include +#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include +#include +#include +#include #include -#include #include "i18n.h" @@ -62,13 +63,14 @@ using std::exception; using std::map; using std::set; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -using boost::weak_ptr; +using std::weak_ptr; using dcp::ArrayData; using dcp::Data; using dcp::raw_convert; @@ -80,7 +82,7 @@ static dcp::MXFMetadata mxf_metadata () { dcp::MXFMetadata meta; - Config* config = Config::instance(); + auto config = Config::instance(); if (!config->dcp_company_name().empty()) { meta.company_name = config->dcp_company_name (); } @@ -114,7 +116,7 @@ ReelWriter::ReelWriter ( output. We will hard-link it into the DCP later. */ - dcp::Standard const standard = film()->interop() ? dcp::INTEROP : dcp::SMPTE; + auto const standard = film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE; boost::filesystem::path const asset = film()->internal_video_asset_dir() / film()->internal_video_asset_filename(_period); @@ -155,19 +157,24 @@ ReelWriter::ReelWriter ( _picture_asset->set_file (asset); _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0); - } else { + } else if (!text_only) { /* We already have a complete picture asset that we can just re-use */ /* XXX: what about if the encryption key changes? */ if (film()->three_d()) { - _picture_asset.reset (new dcp::StereoPictureAsset(asset)); + _picture_asset = make_shared(asset); } else { - _picture_asset.reset (new dcp::MonoPictureAsset(asset)); + _picture_asset = make_shared(asset); } } if (film()->audio_channels()) { - _sound_asset.reset ( - new dcp::SoundAsset (dcp::Fraction(film()->video_frame_rate(), 1), film()->audio_frame_rate(), film()->audio_channels(), film()->audio_language(), standard) + auto lang = film()->audio_language(); + _sound_asset = make_shared ( + dcp::Fraction(film()->video_frame_rate(), 1), + film()->audio_frame_rate(), + film()->audio_channels(), + lang ? *lang : dcp::LanguageTag("en-US"), + standard ); _sound_asset->set_metadata (mxf_metadata()); @@ -178,27 +185,23 @@ ReelWriter::ReelWriter ( DCPOMATIC_ASSERT (film()->directory()); - vector active; - BOOST_FOREACH (int i, film()->mapped_audio_channels()) { - active.push_back (static_cast(i)); - } - /* Write the sound asset into the film directory so that we leave the creation of the DCP directory until the last minute. */ _sound_asset_writer = _sound_asset->start_write ( film()->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary), - active, film()->contains_atmos_content() ); } + + _default_font = dcp::ArrayData(default_font_file()); } /** @param frame reel-relative frame */ void ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const { - shared_ptr handle = film()->info_file_handle(_period, false); + auto handle = film()->info_file_handle(_period, false); dcpomatic_fseek (handle->get(), frame_info_position(frame, eyes), SEEK_SET); checked_fwrite (&info.offset, sizeof(info.offset), handle->get(), handle->file()); checked_fwrite (&info.size, sizeof (info.size), handle->get(), handle->file()); @@ -225,11 +228,11 @@ long ReelWriter::frame_info_position (Frame frame, Eyes eyes) const { switch (eyes) { - case EYES_BOTH: + case Eyes::BOTH: return frame * _info_size; - case EYES_LEFT: + case Eyes::LEFT: return frame * _info_size * 2; - case EYES_RIGHT: + case Eyes::RIGHT: return frame * _info_size * 2 + _info_size; default: DCPOMATIC_ASSERT (false); @@ -241,14 +244,14 @@ ReelWriter::frame_info_position (Frame frame, Eyes eyes) const Frame ReelWriter::check_existing_picture_asset (boost::filesystem::path asset) { - shared_ptr job = _job.lock (); + auto job = _job.lock (); if (job) { job->sub (_("Checking existing image data")); } /* Try to open the existing asset */ - FILE* asset_file = fopen_boost (asset, "rb"); + auto asset_file = fopen_boost (asset, "rb"); if (!asset_file) { LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", asset.string(), errno); return 0; @@ -304,9 +307,9 @@ ReelWriter::write (shared_ptr encoded, Frame frame, Eyes eyes) return; } - dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size()); + auto fin = _picture_asset_writer->write (encoded->data(), encoded->size()); write_frame_info (frame, eyes, fin); - _last_written[eyes] = encoded; + _last_written[static_cast(eyes)] = encoded; } @@ -345,9 +348,9 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes) return; } - dcp::FrameInfo fin = _picture_asset_writer->write ( - _last_written[eyes]->data(), - _last_written[eyes]->size() + auto fin = _picture_asset_writer->write ( + _last_written[static_cast(eyes)]->data(), + _last_written[static_cast(eyes)]->size() ); write_frame_info (frame, eyes, fin); } @@ -381,7 +384,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) boost::filesystem::create_hard_link (video_from, video_to, ec); if (ec) { LOG_WARNING_NC ("Hard-link failed; copying instead"); - shared_ptr job = _job.lock (); + auto job = _job.lock (); if (job) { job->sub (_("Copying video file into DCP")); try { @@ -405,7 +408,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) /* Move the audio asset into the DCP */ if (_sound_asset) { boost::filesystem::path audio_to = output_dcp; - string const aaf = audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary); + auto const aaf = audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary); audio_to /= aaf; boost::system::error_code ec; @@ -422,7 +425,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) if (_atmos_asset) { _atmos_asset_writer->finalize (); boost::filesystem::path atmos_to = output_dcp; - string const aaf = atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary); + auto const aaf = atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary); atmos_to /= aaf; boost::system::error_code ec; @@ -437,14 +440,19 @@ ReelWriter::finish (boost::filesystem::path output_dcp) } } -template -shared_ptr + +/** Try to make a ReelAsset for a subtitles or closed captions in a given period in the DCP. + * A SubtitleAsset can be provided, or we will use one from @ref refs if not. + */ +template +shared_ptr maybe_add_text ( shared_ptr asset, int64_t picture_duration, shared_ptr reel, list const & refs, - list > const & fonts, + vector const & fonts, + dcp::ArrayData default_font, shared_ptr film, DCPTimePeriod period, boost::filesystem::path output_dcp, @@ -453,43 +461,46 @@ maybe_add_text ( { Frame const period_duration = period.duration().frames_round(film->video_frame_rate()); - shared_ptr reel_asset; + shared_ptr reel_asset; if (asset) { /* Add the font to the subtitle content */ - BOOST_FOREACH (shared_ptr j, fonts) { - asset->add_font (j->id(), j->file().get_value_or(default_font_file())); + for (auto const& j: fonts) { + asset->add_font (j.id, j.data.get_value_or(default_font)); } - if (dynamic_pointer_cast (asset)) { - boost::filesystem::path directory = output_dcp / asset->id (); + if (auto interop = dynamic_pointer_cast(asset)) { + auto directory = output_dcp / interop->id (); boost::filesystem::create_directories (directory); - asset->write (directory / ("sub_" + asset->id() + ".xml")); - } else { + interop->write (directory / ("sub_" + interop->id() + ".xml")); + reel_asset = make_shared ( + interop, + dcp::Fraction(film->video_frame_rate(), 1), + picture_duration, + 0 + ); + } else if (auto smpte = dynamic_pointer_cast(asset)) { /* All our assets should be the same length; use the picture asset length here as a reference to set the subtitle one. We'll use the duration rather than the intrinsic duration; we don't care if the picture asset has been trimmed, we're just interested in its presentation length. */ - dynamic_pointer_cast(asset)->set_intrinsic_duration (picture_duration); - - asset->write ( + smpte->set_intrinsic_duration(picture_duration); + smpte->write ( output_dcp / ("sub_" + asset->id() + ".mxf") ); - } - - reel_asset.reset ( - new T ( - asset, - dcp::Fraction (film->video_frame_rate(), 1), + reel_asset = make_shared ( + smpte, + dcp::Fraction(film->video_frame_rate(), 1), picture_duration, 0 - ) - ); + ); + } + } else { /* We don't have a subtitle asset of our own; hopefully we have one to reference */ - BOOST_FOREACH (ReferencedReelAsset j, refs) { - shared_ptr k = dynamic_pointer_cast (j.asset); + for (auto j: refs) { + auto k = dynamic_pointer_cast (j.asset); if (k && j.period == period) { reel_asset = k; /* If we have a hash for this asset in the CPL, assume that it is correct */ @@ -521,20 +532,20 @@ ReelWriter::create_reel_picture (shared_ptr reel, list mono = dynamic_pointer_cast (_picture_asset); + auto mono = dynamic_pointer_cast (_picture_asset); if (mono) { - reel_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0)); + reel_asset = make_shared(mono, 0); } - shared_ptr stereo = dynamic_pointer_cast (_picture_asset); + auto stereo = dynamic_pointer_cast (_picture_asset); if (stereo) { - reel_asset.reset (new dcp::ReelStereoPictureAsset (stereo, 0)); + reel_asset = make_shared(stereo, 0); } } else { LOG_GENERAL ("no picture asset of our own; look through %1", refs.size()); /* We don't have a picture asset of our own; hopefully we have one to reference */ - BOOST_FOREACH (ReferencedReelAsset j, refs) { - shared_ptr k = dynamic_pointer_cast (j.asset); + for (auto j: refs) { + auto k = dynamic_pointer_cast (j.asset); if (k) { LOG_GENERAL ("candidate picture asset period is %1-%2", j.period.from.get(), j.period.to.get()); } @@ -571,12 +582,12 @@ ReelWriter::create_reel_sound (shared_ptr reel, list(_sound_asset, 0); } else { LOG_GENERAL ("no sound asset of our own; look through %1", refs.size()); /* We don't have a sound asset of our own; hopefully we have one to reference */ - BOOST_FOREACH (ReferencedReelAsset j, refs) { - shared_ptr k = dynamic_pointer_cast (j.asset); + for (auto j: refs) { + auto k = dynamic_pointer_cast (j.asset); if (k) { LOG_GENERAL ("candidate sound asset period is %1-%2", j.period.from.get(), j.period.to.get()); } @@ -590,7 +601,7 @@ ReelWriter::create_reel_sound (shared_ptr reel, listvideo_frame_rate()); + auto const period_duration = _period.duration().frames_round(film()->video_frame_rate()); DCPOMATIC_ASSERT (reel_asset); if (reel_asset->actual_duration() != period_duration) { @@ -615,30 +626,31 @@ void ReelWriter::create_reel_text ( shared_ptr reel, list const & refs, - list > const& fonts, + vector const& fonts, int64_t duration, boost::filesystem::path output_dcp, bool ensure_subtitles, set ensure_closed_captions ) const { - shared_ptr subtitle = maybe_add_text ( - _subtitle_asset, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only + auto subtitle = maybe_add_text ( + _subtitle_asset, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only ); if (subtitle) { /* We have a subtitle asset that we either made or are referencing */ - if (!film()->subtitle_languages().empty()) { - subtitle->set_language (film()->subtitle_languages().front()); + if (auto main_language = film()->subtitle_languages().first) { + subtitle->set_language (*main_language); } } else if (ensure_subtitles) { /* We had no subtitle asset, but we've been asked to make sure there is one */ - subtitle = maybe_add_text( - empty_text_asset(TEXT_OPEN_SUBTITLE, optional()), + subtitle = maybe_add_text ( + empty_text_asset(TextType::OPEN_SUBTITLE, optional(), true), duration, reel, refs, fonts, + _default_font, film(), _period, output_dcp, @@ -646,53 +658,51 @@ ReelWriter::create_reel_text ( ); } - for (map >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) { - shared_ptr a = maybe_add_text ( - i->second, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only + for (auto const& i: _closed_caption_assets) { + auto a = maybe_add_text ( + i.second, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only ); DCPOMATIC_ASSERT (a); - a->set_annotation_text (i->first.name); - if (!i->first.language.empty()) { - a->set_language (dcp::LanguageTag(i->first.language)); + a->set_annotation_text (i.first.name); + if (i.first.language) { + a->set_language (i.first.language.get()); } - ensure_closed_captions.erase (i->first); + ensure_closed_captions.erase (i.first); } /* Make empty tracks for anything we've been asked to ensure but that we haven't added */ - BOOST_FOREACH (DCPTextTrack i, ensure_closed_captions) { - shared_ptr a = maybe_add_text ( - empty_text_asset(TEXT_CLOSED_CAPTION, i), duration, reel, refs, fonts, film(), _period, output_dcp, _text_only + for (auto i: ensure_closed_captions) { + auto a = maybe_add_text ( + empty_text_asset(TextType::CLOSED_CAPTION, i, true), duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only ); DCPOMATIC_ASSERT (a); a->set_annotation_text (i.name); - if (!i.language.empty()) { - a->set_language (dcp::LanguageTag(i.language)); + if (i.language) { + a->set_language (i.language.get()); } } } - void ReelWriter::create_reel_markers (shared_ptr reel) const { - Film::Markers markers = film()->markers(); + auto markers = film()->markers(); film()->add_ffoc_lfoc(markers); Film::Markers reel_markers; - for (Film::Markers::const_iterator i = markers.begin(); i != markers.end(); ++i) { - if (_period.contains(i->second)) { - reel_markers[i->first] = i->second; + for (auto const& i: markers) { + if (_period.contains(i.second)) { + reel_markers[i.first] = i.second; } } if (!reel_markers.empty ()) { - shared_ptr ma (new dcp::ReelMarkersAsset(dcp::Fraction(film()->video_frame_rate(), 1), 0)); - for (map::const_iterator i = reel_markers.begin(); i != reel_markers.end(); ++i) { - int h, m, s, f; - DCPTime relative = i->second - _period.from; - relative.split (film()->video_frame_rate(), h, m, s, f); - ma->set (i->first, dcp::Time(h, m, s, f, film()->video_frame_rate())); + auto ma = make_shared(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration(), 0); + for (auto const& i: reel_markers) { + DCPTime relative = i.second - _period.from; + auto hmsf = relative.split (film()->video_frame_rate()); + ma->set (i.first, dcp::Time(hmsf.h, hmsf.m, hmsf.s, hmsf.f, film()->video_frame_rate())); } reel->add (ma); } @@ -705,7 +715,7 @@ ReelWriter::create_reel_markers (shared_ptr reel) const shared_ptr ReelWriter::create_reel ( list const & refs, - list > const & fonts, + vector const & fonts, boost::filesystem::path output_dcp, bool ensure_subtitles, set ensure_closed_captions @@ -713,7 +723,7 @@ ReelWriter::create_reel ( { LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count); - shared_ptr reel (new dcp::Reel()); + auto reel = make_shared(); /* This is a bit of a hack; in the strange `_text_only' mode we have no picture, so we don't know * how long the subtitle / CCAP assets should be. However, since we're only writing them to see @@ -721,7 +731,7 @@ ReelWriter::create_reel ( */ int64_t duration = 0; if (!_text_only) { - shared_ptr reel_picture_asset = create_reel_picture (reel, refs); + auto reel_picture_asset = create_reel_picture (reel, refs); duration = reel_picture_asset->actual_duration (); create_reel_sound (reel, refs); create_reel_markers (reel); @@ -730,14 +740,15 @@ ReelWriter::create_reel ( create_reel_text (reel, refs, fonts, duration, output_dcp, ensure_subtitles, ensure_closed_captions); if (_atmos_asset) { - reel->add (shared_ptr(new dcp::ReelAtmosAsset(_atmos_asset, 0))); + reel->add (make_shared(_atmos_asset, 0)); } return reel; } void -ReelWriter::calculate_digests (boost::function set_progress) +ReelWriter::calculate_digests (std::function set_progress) +try { if (_picture_asset) { _picture_asset->hash (set_progress); @@ -750,6 +761,10 @@ ReelWriter::calculate_digests (boost::function set_progress) if (_atmos_asset) { _atmos_asset->hash (set_progress); } +} catch (boost::thread_interrupted) { + /* set_progress contains an interruption_point, so any of these methods + * may throw thread_interrupted, at which point we just give up. + */ } Frame @@ -772,29 +787,29 @@ ReelWriter::write (shared_ptr audio) shared_ptr -ReelWriter::empty_text_asset (TextType type, optional track) const +ReelWriter::empty_text_asset (TextType type, optional track, bool with_dummy) const { shared_ptr asset; - vector lang = film()->subtitle_languages(); + auto lang = film()->subtitle_languages(); if (film()->interop()) { - shared_ptr s (new dcp::InteropSubtitleAsset ()); + auto s = make_shared(); s->set_movie_title (film()->name()); - if (type == TEXT_OPEN_SUBTITLE) { - s->set_language (lang.empty() ? "Unknown" : lang.front().to_string()); - } else if (!track->language.empty()) { - s->set_language (track->language); + if (type == TextType::OPEN_SUBTITLE) { + s->set_language (lang.first ? lang.first->to_string() : "Unknown"); + } else if (track->language) { + s->set_language (track->language->to_string()); } s->set_reel_number (raw_convert (_reel_index + 1)); asset = s; } else { - shared_ptr s (new dcp::SMPTESubtitleAsset ()); + auto s = make_shared(); s->set_content_title_text (film()->name()); s->set_metadata (mxf_metadata()); - if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) { - s->set_language (lang.front()); - } else if (track && !track->language.empty()) { - s->set_language (dcp::LanguageTag(track->language)); + if (type == TextType::OPEN_SUBTITLE && lang.first) { + s->set_language (*lang.first); + } else if (track && track->language) { + s->set_language (dcp::LanguageTag(track->language->to_string())); } s->set_edit_rate (dcp::Fraction (film()->video_frame_rate(), 1)); s->set_reel_number (_reel_index + 1); @@ -803,6 +818,32 @@ ReelWriter::empty_text_asset (TextType type, optional track) const if (film()->encrypted()) { s->set_key (film()->key()); } + if (with_dummy) { + s->add ( + std::make_shared( + optional(), + false, + false, + false, + dcp::Colour(), + 42, + 1.0, + dcp::Time(0, 0, 0, 0, 24), + dcp::Time(0, 0, 1, 0, 24), + 0.5, + dcp::HAlign::CENTER, + 0.5, + dcp::VAlign::CENTER, + dcp::Direction::LTR, + " ", + dcp::Effect::NONE, + dcp::Colour(), + dcp::Time(), + dcp::Time(), + 0 + ) + ); + } asset = s; } @@ -816,10 +857,10 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, shared_ptr asset; switch (type) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: asset = _subtitle_asset; break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: DCPOMATIC_ASSERT (track); asset = _closed_caption_assets[*track]; break; @@ -828,14 +869,14 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, } if (!asset) { - asset = empty_text_asset (type, track); + asset = empty_text_asset (type, track, false); } switch (type) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: _subtitle_asset = asset; break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: DCPOMATIC_ASSERT (track); _closed_caption_assets[*track] = asset; break; @@ -843,23 +884,23 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, DCPOMATIC_ASSERT (false); } - BOOST_FOREACH (StringText i, subs.string) { - /* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */ - i.set_in (i.in() - dcp::Time (_period.from.seconds(), i.in().tcr)); - i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr)); - asset->add (shared_ptr(new dcp::SubtitleString(i))); + /* timecode rate for subtitles we emit; we might as well stick to ms accuracy here, I think */ + auto const tcr = 1000; + + for (auto i: subs.string) { + i.set_in (dcp::Time(period.from.seconds() - _period.from.seconds(), tcr)); + i.set_out (dcp::Time(period.to.seconds() - _period.from.seconds(), tcr)); + asset->add (make_shared(i)); } - BOOST_FOREACH (BitmapText i, subs.bitmap) { + for (auto i: subs.bitmap) { asset->add ( - shared_ptr( - new dcp::SubtitleImage( - i.image->as_png(), - dcp::Time(period.from.seconds() - _period.from.seconds(), film()->video_frame_rate()), - dcp::Time(period.to.seconds() - _period.from.seconds(), film()->video_frame_rate()), - i.rectangle.x, dcp::HALIGN_LEFT, i.rectangle.y, dcp::VALIGN_TOP, - dcp::Time(), dcp::Time() - ) + make_shared( + i.image->as_png(), + dcp::Time(period.from.seconds() - _period.from.seconds(), tcr), + dcp::Time(period.to.seconds() - _period.from.seconds(), tcr), + i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, + dcp::Time(), dcp::Time() ) ); } @@ -873,7 +914,7 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptrthree_d() ? EYES_LEFT : EYES_BOTH); + auto const info = read_frame_info (info_file, frame, film()->three_d() ? Eyes::LEFT : Eyes::BOTH); bool ok = true;