X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=1d2ec557fd15907f86016b46578885246657e7cc;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=81057185aea935c24c01ce96f20b53d2c97630b4;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 81057185a..1d2ec557f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -25,15 +25,19 @@ #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 @@ -47,124 +51,176 @@ #include #include #include -#include #include "i18n.h" using std::list; using std::string; using std::cout; +using std::exception; using std::map; -using boost::shared_ptr; +using std::set; +using std::vector; +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 std::weak_ptr; +using dcp::ArrayData; using dcp::Data; using dcp::raw_convert; using namespace dcpomatic; int const ReelWriter::_info_size = 48; +static dcp::MXFMetadata +mxf_metadata () +{ + dcp::MXFMetadata meta; + Config* config = Config::instance(); + if (!config->dcp_company_name().empty()) { + meta.company_name = config->dcp_company_name (); + } + if (!config->dcp_product_name().empty()) { + meta.product_name = config->dcp_product_name (); + } + if (!config->dcp_product_version().empty()) { + meta.product_version = config->dcp_product_version (); + } + return meta; +} + +/** @param job Related job, or 0. + * @param text_only true to enable a special mode where the writer will expect only subtitles and closed captions to be written + * (no picture nor sound) and not give errors in that case. This is used by the hints system to check the potential sizes of + * subtitle / closed caption files. + */ ReelWriter::ReelWriter ( - shared_ptr film, DCPTimePeriod period, shared_ptr job, int reel_index, int reel_count, optional content_summary + weak_ptr weak_film, DCPTimePeriod period, shared_ptr job, int reel_index, int reel_count, bool text_only ) - : _film (film) + : WeakConstFilm (weak_film) , _period (period) - , _last_written_video_frame (-1) - , _last_written_eyes (EYES_RIGHT) , _reel_index (reel_index) , _reel_count (reel_count) - , _content_summary (content_summary) + , _content_summary (film()->content_summary(period)) + , _job (job) + , _text_only (text_only) { - /* Create our picture asset in a subdirectory, named according to those - film's parameters which affect the video output. We will hard-link - it into the DCP later. + /* Create or find our picture asset in a subdirectory, named + according to those film's parameters which affect the video + output. We will hard-link it into the DCP later. */ - dcp::Standard const standard = _film->interop() ? dcp::INTEROP : dcp::SMPTE; + dcp::Standard const standard = film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE; - if (_film->three_d ()) { - _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard)); - } else { - _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard)); - } + boost::filesystem::path const asset = + film()->internal_video_asset_dir() / film()->internal_video_asset_filename(_period); - _picture_asset->set_size (_film->frame_size ()); + _first_nonexistant_frame = check_existing_picture_asset (asset); - if (_film->encrypted ()) { - _picture_asset->set_key (_film->key ()); - _picture_asset->set_context_id (_film->context_id ()); - } + if (_first_nonexistant_frame < period.duration().frames_round(film()->video_frame_rate())) { + /* We do not have a complete picture asset. If there is an + existing asset, break any hard links to it as we are about + to change its contents (if only by changing the IDs); see + #1126. + */ + if (boost::filesystem::exists(asset) && boost::filesystem::hard_link_count(asset) > 1) { + if (job) { + job->sub (_("Copying old video file")); + copy_in_bits (asset, asset.string() + ".tmp", bind(&Job::set_progress, job.get(), _1, false)); + } else { + boost::filesystem::copy_file (asset, asset.string() + ".tmp"); + } + boost::filesystem::remove (asset); + boost::filesystem::rename (asset.string() + ".tmp", asset); + } - _picture_asset->set_file ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period) - ); - job->sub (_("Checking existing image data")); - _first_nonexistant_frame = check_existing_picture_asset (); + if (film()->three_d()) { + _picture_asset.reset (new dcp::StereoPictureAsset(dcp::Fraction(film()->video_frame_rate(), 1), standard)); + } else { + _picture_asset.reset (new dcp::MonoPictureAsset(dcp::Fraction(film()->video_frame_rate(), 1), standard)); + } + + _picture_asset->set_size (film()->frame_size()); + _picture_asset->set_metadata (mxf_metadata()); - _picture_asset_writer = _picture_asset->start_write ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period), - _first_nonexistant_frame > 0 - ); + if (film()->encrypted()) { + _picture_asset->set_key (film()->key()); + _picture_asset->set_context_id (film()->context_id()); + } - if (_film->audio_channels ()) { + _picture_asset->set_file (asset); + _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0); + } 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)); + } else { + _picture_asset.reset (new dcp::MonoPictureAsset(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 (), standard) + new dcp::SoundAsset (dcp::Fraction(film()->video_frame_rate(), 1), film()->audio_frame_rate(), film()->audio_channels(), film()->audio_language(), standard) ); - if (_film->encrypted ()) { - _sound_asset->set_key (_film->key ()); + _sound_asset->set_metadata (mxf_metadata()); + + if (film()->encrypted()) { + _sound_asset->set_key (film()->key()); } - DCPOMATIC_ASSERT (_film->directory()); + DCPOMATIC_ASSERT (film()->directory()); + + vector active; + for (auto 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) + 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 { - FILE* file = 0; - boost::filesystem::path info_file = _film->info_file (_period); - - bool const read = boost::filesystem::exists (info_file); - - if (read) { - file = fopen_boost (info_file, "r+b"); - } else { - file = fopen_boost (info_file, "wb"); - } - if (!file) { - throw OpenFileError (info_file, errno, read); - } - dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); - checked_fwrite (&info.offset, sizeof (info.offset), file, info_file); - checked_fwrite (&info.size, sizeof (info.size), file, info_file); - checked_fwrite (info.hash.c_str(), info.hash.size(), file, info_file); - fclose (file); + shared_ptr 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()); + checked_fwrite (info.hash.c_str(), info.hash.size(), handle->get(), handle->file()); } dcp::FrameInfo -ReelWriter::read_frame_info (FILE* file, Frame frame, Eyes eyes) const +ReelWriter::read_frame_info (shared_ptr info, Frame frame, Eyes eyes) const { - dcp::FrameInfo info; - dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); - checked_fread (&info.offset, sizeof(info.offset), file, _film->info_file(_period)); - checked_fread (&info.size, sizeof(info.size), file, _film->info_file(_period)); + dcp::FrameInfo frame_info; + dcpomatic_fseek (info->get(), frame_info_position(frame, eyes), SEEK_SET); + checked_fread (&frame_info.offset, sizeof(frame_info.offset), info->get(), info->file()); + checked_fread (&frame_info.size, sizeof(frame_info.size), info->get(), info->file()); char hash_buffer[33]; - checked_fread (hash_buffer, 32, file, _film->info_file(_period)); + checked_fread (hash_buffer, 32, info->get(), info->file()); hash_buffer[32] = '\0'; - info.hash = hash_buffer; + frame_info.hash = hash_buffer; - return info; + return frame_info; } long @@ -185,19 +241,12 @@ ReelWriter::frame_info_position (Frame frame, Eyes eyes) const } Frame -ReelWriter::check_existing_picture_asset () +ReelWriter::check_existing_picture_asset (boost::filesystem::path asset) { - DCPOMATIC_ASSERT (_picture_asset->file()); - boost::filesystem::path asset = _picture_asset->file().get(); + shared_ptr job = _job.lock (); - /* If there is an existing asset, break any hard links to it as we are about to change its contents - (if only by changing the IDs); see #1126. - */ - - if (boost::filesystem::exists(asset) && boost::filesystem::hard_link_count(asset) > 1) { - boost::filesystem::copy_file (asset, asset.string() + ".tmp"); - boost::filesystem::remove (asset); - boost::filesystem::rename (asset.string() + ".tmp", asset); + if (job) { + job->sub (_("Checking existing image data")); } /* Try to open the existing asset */ @@ -209,19 +258,22 @@ ReelWriter::check_existing_picture_asset () LOG_GENERAL ("Opened existing asset at %1", asset.string()); } - /* Offset of the last dcp::FrameInfo in the info file */ - int const n = (boost::filesystem::file_size (_film->info_file(_period)) / _info_size) - 1; - LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size (_film->info_file(_period)), _info_size); + shared_ptr info_file; - FILE* info_file = fopen_boost (_film->info_file(_period), "rb"); - if (!info_file) { + try { + info_file = film()->info_file_handle (_period, true); + } catch (OpenFileError &) { LOG_GENERAL_NC ("Could not open film info file"); fclose (asset_file); return 0; } + /* Offset of the last dcp::FrameInfo in the info file */ + int const n = (boost::filesystem::file_size(info_file->file()) / _info_size) - 1; + LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size(info_file->file()), _info_size); + Frame first_nonexistant_frame; - if (_film->three_d ()) { + if (film()->three_d()) { /* Start looking at the last left frame */ first_nonexistant_frame = n / 2; } else { @@ -232,7 +284,7 @@ ReelWriter::check_existing_picture_asset () --first_nonexistant_frame; } - if (!_film->three_d() && first_nonexistant_frame > 0) { + if (!film()->three_d() && first_nonexistant_frame > 0) { /* If we are doing 3D we might have found a good L frame with no R, so only do this if we're in 2D and we've just found a good B(oth) frame. */ @@ -242,45 +294,70 @@ ReelWriter::check_existing_picture_asset () LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame); fclose (asset_file); - fclose (info_file); return first_nonexistant_frame; } void -ReelWriter::write (optional encoded, Frame frame, Eyes eyes) +ReelWriter::write (shared_ptr encoded, Frame frame, Eyes eyes) { - dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data().get (), encoded->size()); + if (!_picture_asset_writer) { + /* We're not writing any data */ + return; + } + + dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size()); write_frame_info (frame, eyes, fin); _last_written[eyes] = encoded; - _last_written_video_frame = frame; - _last_written_eyes = eyes; } + +void +ReelWriter::write (shared_ptr atmos, AtmosMetadata metadata) +{ + if (!_atmos_asset) { + _atmos_asset = metadata.create (dcp::Fraction(film()->video_frame_rate(), 1)); + if (film()->encrypted()) { + _atmos_asset->set_key(film()->key()); + } + _atmos_asset_writer = _atmos_asset->start_write ( + film()->directory().get() / atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary) + ); + } + _atmos_asset_writer->write (atmos); +} + + void -ReelWriter::fake_write (Frame frame, Eyes eyes, int size) +ReelWriter::fake_write (int size) { + if (!_picture_asset_writer) { + /* We're not writing any data */ + return; + } + _picture_asset_writer->fake_write (size); - _last_written_video_frame = frame; - _last_written_eyes = eyes; } void ReelWriter::repeat_write (Frame frame, Eyes eyes) { + if (!_picture_asset_writer) { + /* We're not writing any data */ + return; + } + dcp::FrameInfo fin = _picture_asset_writer->write ( - _last_written[eyes]->data().get(), + _last_written[eyes]->data(), _last_written[eyes]->size() ); write_frame_info (frame, eyes, fin); - _last_written_video_frame = frame; - _last_written_eyes = eyes; } void -ReelWriter::finish () +ReelWriter::finish (boost::filesystem::path output_dcp) { - if (!_picture_asset_writer->finalize ()) { + if (_picture_asset_writer && !_picture_asset_writer->finalize ()) { /* Nothing was written to the picture asset */ LOG_GENERAL ("Nothing was written to reel %1 of %2", _reel_index, _reel_count); _picture_asset.reset (); @@ -295,18 +372,32 @@ ReelWriter::finish () if (_picture_asset) { DCPOMATIC_ASSERT (_picture_asset->file()); boost::filesystem::path video_from = _picture_asset->file().get(); - boost::filesystem::path video_to; - video_to /= _film->dir (_film->dcp_name()); + boost::filesystem::path video_to = output_dcp; video_to /= video_asset_filename (_picture_asset, _reel_index, _reel_count, _content_summary); - + /* There may be an existing "to" file if we are recreating a DCP in the same place without + changing any video. + */ boost::system::error_code ec; + boost::filesystem::remove (video_to, ec); + boost::filesystem::create_hard_link (video_from, video_to, ec); if (ec) { LOG_WARNING_NC ("Hard-link failed; copying instead"); - boost::filesystem::copy_file (video_from, video_to, ec); - if (ec) { - LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ()); - throw FileError (ec.message(), video_from); + shared_ptr job = _job.lock (); + if (job) { + job->sub (_("Copying video file into DCP")); + try { + copy_in_bits (video_from, video_to, bind(&Job::set_progress, job.get(), _1, false)); + } catch (exception& e) { + LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), e.what()); + throw FileError (e.what(), video_from); + } + } else { + boost::filesystem::copy_file (video_from, video_to, ec); + if (ec) { + LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message()); + throw FileError (ec.message(), video_from); + } } } @@ -315,13 +406,12 @@ ReelWriter::finish () /* Move the audio asset into the DCP */ if (_sound_asset) { - boost::filesystem::path audio_to; - audio_to /= _film->dir (_film->dcp_name ()); + boost::filesystem::path audio_to = output_dcp; string const aaf = audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary); audio_to /= aaf; boost::system::error_code ec; - boost::filesystem::rename (_film->file (aaf), audio_to, ec); + boost::filesystem::rename (film()->file(aaf), audio_to, ec); if (ec) { throw FileError ( String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), aaf @@ -330,6 +420,23 @@ ReelWriter::finish () _sound_asset->set_file (audio_to); } + + 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); + atmos_to /= aaf; + + boost::system::error_code ec; + boost::filesystem::rename (film()->file(aaf), atmos_to, ec); + if (ec) { + throw FileError ( + String::compose (_("could not move atmos asset into the DCP (%1)"), ec.value ()), aaf + ); + } + + _atmos_asset->set_file (atmos_to); + } } template @@ -339,9 +446,12 @@ maybe_add_text ( 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 + DCPTimePeriod period, + boost::filesystem::path output_dcp, + bool text_only ) { Frame const period_duration = period.duration().frames_round(film->video_frame_rate()); @@ -349,28 +459,13 @@ maybe_add_text ( shared_ptr reel_asset; if (asset) { - boost::filesystem::path liberation_normal; - try { - liberation_normal = shared_path() / "LiberationSans-Regular.ttf"; - if (!boost::filesystem::exists (liberation_normal)) { - /* Hack for unit tests */ - liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf"; - } - } catch (boost::filesystem::filesystem_error& e) { - - } - - if (!boost::filesystem::exists(liberation_normal)) { - liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"; - } - /* Add the font to the subtitle content */ - BOOST_FOREACH (shared_ptr j, fonts) { - asset->add_font (j->id(), j->file().get_value_or(liberation_normal)); + 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 = film->dir (film->dcp_name ()) / asset->id (); + boost::filesystem::path directory = output_dcp / asset->id (); boost::filesystem::create_directories (directory); asset->write (directory / ("sub_" + asset->id() + ".xml")); } else { @@ -382,7 +477,7 @@ maybe_add_text ( dynamic_pointer_cast(asset)->set_intrinsic_duration (picture_duration); asset->write ( - film->dir(film->dcp_name()) / ("sub_" + asset->id() + ".mxf") + output_dcp / ("sub_" + asset->id() + ".mxf") ); } @@ -396,7 +491,7 @@ maybe_add_text ( ); } else { /* We don't have a subtitle asset of our own; hopefully we have one to reference */ - BOOST_FOREACH (ReferencedReelAsset j, refs) { + for (auto j: refs) { shared_ptr k = dynamic_pointer_cast (j.asset); if (k && j.period == period) { reel_asset = k; @@ -409,7 +504,7 @@ maybe_add_text ( } if (reel_asset) { - if (reel_asset->actual_duration() != period_duration) { + if (!text_only && reel_asset->actual_duration() != period_duration) { throw ProgrammingError ( __FILE__, __LINE__, String::compose ("%1 vs %2", reel_asset->actual_duration(), period_duration) @@ -421,67 +516,75 @@ maybe_add_text ( return reel_asset; } -shared_ptr -ReelWriter::create_reel (list const & refs, list > const & fonts) -{ - shared_ptr reel (new dcp::Reel ()); - shared_ptr reel_picture_asset; +shared_ptr +ReelWriter::create_reel_picture (shared_ptr reel, list const & refs) const +{ + shared_ptr reel_asset; if (_picture_asset) { /* We have made a picture asset of our own. Put it into the reel */ shared_ptr mono = dynamic_pointer_cast (_picture_asset); if (mono) { - reel_picture_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0)); + reel_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0)); } shared_ptr stereo = dynamic_pointer_cast (_picture_asset); if (stereo) { - reel_picture_asset.reset (new dcp::ReelStereoPictureAsset (stereo, 0)); + reel_asset.reset (new dcp::ReelStereoPictureAsset (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) { + for (auto j: refs) { shared_ptr 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()); } if (k && j.period == _period) { - reel_picture_asset = k; + reel_asset = k; } } } - LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count); - - Frame const period_duration = _period.duration().frames_round(_film->video_frame_rate()); + Frame const period_duration = _period.duration().frames_round(film()->video_frame_rate()); - DCPOMATIC_ASSERT (reel_picture_asset); - if (reel_picture_asset->duration() != period_duration) { + DCPOMATIC_ASSERT (reel_asset); + if (reel_asset->duration() != period_duration) { throw ProgrammingError ( __FILE__, __LINE__, - String::compose ("%1 vs %2", reel_picture_asset->actual_duration(), period_duration) + String::compose ("%1 vs %2", reel_asset->actual_duration(), period_duration) ); } - reel->add (reel_picture_asset); + reel->add (reel_asset); /* If we have a hash for this asset in the CPL, assume that it is correct */ - if (reel_picture_asset->hash()) { - reel_picture_asset->asset_ref()->set_hash (reel_picture_asset->hash().get()); + if (reel_asset->hash()) { + reel_asset->asset_ref()->set_hash (reel_asset->hash().get()); } - shared_ptr reel_sound_asset; + return reel_asset; +} + + +void +ReelWriter::create_reel_sound (shared_ptr reel, list const & refs) const +{ + shared_ptr reel_asset; if (_sound_asset) { /* We have made a sound asset of our own. Put it into the reel */ - reel_sound_asset.reset (new dcp::ReelSoundAsset (_sound_asset, 0)); + reel_asset.reset (new dcp::ReelSoundAsset(_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) { + for (auto j: refs) { shared_ptr 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()); + } if (k && j.period == _period) { - reel_sound_asset = k; + reel_asset = k; /* If we have a hash for this asset in the CPL, assume that it is correct */ if (k->hash()) { k->asset_ref()->set_hash (k->hash().get()); @@ -490,50 +593,149 @@ ReelWriter::create_reel (list const & refs, listactual_duration() != period_duration) { + Frame const period_duration = _period.duration().frames_round(film()->video_frame_rate()); + + DCPOMATIC_ASSERT (reel_asset); + if (reel_asset->actual_duration() != period_duration) { LOG_ERROR ( "Reel sound asset has length %1 but reel period is %2", - reel_sound_asset->actual_duration(), + reel_asset->actual_duration(), period_duration ); - if (reel_sound_asset->actual_duration() != period_duration) { + if (reel_asset->actual_duration() != period_duration) { throw ProgrammingError ( __FILE__, __LINE__, - String::compose ("%1 vs %2", reel_sound_asset->actual_duration(), period_duration) + String::compose ("%1 vs %2", reel_asset->actual_duration(), period_duration) ); } } - reel->add (reel_sound_asset); + reel->add (reel_asset); +} + + +void +ReelWriter::create_reel_text ( + shared_ptr reel, + list const & refs, + 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, _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()); + } + } 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()), + duration, + reel, + refs, + fonts, + _default_font, + film(), + _period, + output_dcp, + _text_only + ); + } - maybe_add_text (_subtitle_asset, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period); for (map >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) { shared_ptr a = maybe_add_text ( - i->second, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period + i->second, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only ); + DCPOMATIC_ASSERT (a); a->set_annotation_text (i->first.name); - a->set_language (i->first.language); + if (!i->first.language.empty()) { + a->set_language (dcp::LanguageTag(i->first.language)); + } + + ensure_closed_captions.erase (i->first); } - map markers = _film->markers (); - map reel_markers; - for (map::const_iterator i = markers.begin(); i != markers.end(); ++i) { + /* Make empty tracks for anything we've been asked to ensure but that we haven't added */ + for (auto i: ensure_closed_captions) { + shared_ptr a = maybe_add_text ( + empty_text_asset(TEXT_CLOSED_CAPTION, i), 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)); + } + } +} + + + +void +ReelWriter::create_reel_markers (shared_ptr reel) const +{ + Film::Markers 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; } } if (!reel_markers.empty ()) { - shared_ptr ma (new dcp::ReelMarkersAsset(dcp::Fraction(_film->video_frame_rate(), 1), 0)); + auto ma = make_shared(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration(), 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())); + relative.split (film()->video_frame_rate(), h, m, s, f); + ma->set (i->first, dcp::Time(h, m, s, f, film()->video_frame_rate())); } reel->add (ma); } +} + + +/** @param ensure_subtitles true to make sure the reel has a subtitle asset. + * @param ensure_closed_captions make sure the reel has these closed caption tracks. + */ +shared_ptr +ReelWriter::create_reel ( + list const & refs, + vector const & fonts, + boost::filesystem::path output_dcp, + bool ensure_subtitles, + set ensure_closed_captions + ) +{ + 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()); + + /* 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 + * how big they are, we don't care about that. + */ + int64_t duration = 0; + if (!_text_only) { + shared_ptr reel_picture_asset = create_reel_picture (reel, refs); + duration = reel_picture_asset->actual_duration (); + create_reel_sound (reel, refs); + create_reel_markers (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))); + } return reel; } @@ -548,12 +750,16 @@ ReelWriter::calculate_digests (boost::function set_progress) if (_sound_asset) { _sound_asset->hash (set_progress); } + + if (_atmos_asset) { + _atmos_asset->hash (set_progress); + } } Frame ReelWriter::start () const { - return _period.from.frames_floor (_film->video_frame_rate()); + return _period.from.frames_floor (film()->video_frame_rate()); } @@ -568,6 +774,46 @@ ReelWriter::write (shared_ptr audio) _sound_asset_writer->write (audio->data(), audio->frames()); } + +shared_ptr +ReelWriter::empty_text_asset (TextType type, optional track) const +{ + shared_ptr asset; + + vector lang = film()->subtitle_languages(); + if (film()->interop()) { + shared_ptr s (new dcp::InteropSubtitleAsset ()); + 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); + } + s->set_reel_number (raw_convert (_reel_index + 1)); + asset = s; + } else { + shared_ptr s (new dcp::SMPTESubtitleAsset ()); + 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)); + } + s->set_edit_rate (dcp::Fraction (film()->video_frame_rate(), 1)); + s->set_reel_number (_reel_index + 1); + s->set_time_code_rate (film()->video_frame_rate()); + s->set_start_time (dcp::Time ()); + if (film()->encrypted()) { + s->set_key (film()->key()); + } + asset = s; + } + + return asset; +} + + void ReelWriter::write (PlayerText subs, TextType type, optional track, DCPTimePeriod period) { @@ -586,34 +832,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, } if (!asset) { - string lang = _film->subtitle_language (); - if (_film->interop ()) { - shared_ptr s (new dcp::InteropSubtitleAsset ()); - s->set_movie_title (_film->name ()); - if (type == TEXT_OPEN_SUBTITLE) { - s->set_language (lang.empty() ? "Unknown" : lang); - } else { - s->set_language (track->language); - } - s->set_reel_number (raw_convert (_reel_index + 1)); - asset = s; - } else { - shared_ptr s (new dcp::SMPTESubtitleAsset ()); - s->set_content_title_text (_film->name ()); - if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) { - s->set_language (lang); - } else { - s->set_language (track->language); - } - s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); - s->set_reel_number (_reel_index + 1); - s->set_time_code_rate (_film->video_frame_rate ()); - s->set_start_time (dcp::Time ()); - if (_film->encrypted ()) { - s->set_key (_film->key ()); - } - asset = s; - } + asset = empty_text_asset (type, track); } switch (type) { @@ -628,21 +847,21 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, DCPOMATIC_ASSERT (false); } - 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() - 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))); } - 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(), _film->video_frame_rate()), - dcp::Time(period.to.seconds(), _film->video_frame_rate()), - i.rectangle.x, dcp::HALIGN_LEFT, i.rectangle.y, dcp::VALIGN_TOP, + 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() ) ) @@ -651,28 +870,28 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, } bool -ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const +ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr info_file, Frame frame) const { LOG_GENERAL ("Checking existing picture frame %1", frame); /* Read the data from the info file; for 3D we just check the left frames until we find a good one. */ - dcp::FrameInfo const info = read_frame_info (info_file, frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); + dcp::FrameInfo const info = read_frame_info (info_file, frame, film()->three_d() ? EYES_LEFT : EYES_BOTH); bool ok = true; /* Read the data from the asset and hash it */ dcpomatic_fseek (asset_file, info.offset, SEEK_SET); - Data data (info.size); - size_t const read = fread (data.data().get(), 1, data.size(), asset_file); + ArrayData data (info.size); + size_t const read = fread (data.data(), 1, data.size(), asset_file); LOG_GENERAL ("Read %1 bytes of asset data; wanted %2", read, info.size); if (read != static_cast (data.size ())) { LOG_GENERAL ("Existing frame %1 is incomplete", frame); ok = false; } else { Digester digester; - digester.add (data.data().get(), data.size()); + digester.add (data.data(), data.size()); LOG_GENERAL ("Hash %1 vs %2", digester.get(), info.hash); if (digester.get() != info.hash) { LOG_GENERAL ("Existing frame %1 failed hash check", frame);