X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=a927770a5858e55698dc83a86df8787f2860475f;hp=69709fa0de5d0dbfc899f49547c0059805f273ba;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hpb=5728b8095b9522626d61b1c684a9492f759e2870 diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 69709fa0d..a927770a5 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. @@ -27,13 +27,17 @@ #include "digester.h" #include "font.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 @@ -54,75 +58,131 @@ using std::list; using std::string; using std::cout; +using std::exception; using std::map; +using std::vector; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +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 */ ReelWriter::ReelWriter ( shared_ptr film, DCPTimePeriod period, shared_ptr job, int reel_index, int reel_count, optional content_summary ) : _film (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) + , _job (job) { - /* 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; - 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_writer = _picture_asset->start_write ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period), - _first_nonexistant_frame > 0 - ); + _picture_asset->set_size (_film->frame_size()); + _picture_asset->set_metadata (mxf_metadata()); + + if (_film->encrypted ()) { + _picture_asset->set_key (_film->key()); + _picture_asset->set_context_id (_film->context_id()); + } + + _picture_asset->set_file (asset); + _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0); + } else { + /* 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) ); + _sound_asset->set_metadata (mxf_metadata()); + if (_film->encrypted ()) { _sound_asset->set_key (_film->key ()); } 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) + _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary), + active, + _film->contains_atmos_content() ); } } @@ -131,40 +191,27 @@ ReelWriter::ReelWriter ( 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 +232,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(); - - /* 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. - */ + shared_ptr job = _job.lock (); - 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,17 +249,20 @@ 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 ()) { /* Start looking at the last left frame */ @@ -242,45 +285,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 () { - 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 (); @@ -298,15 +366,30 @@ ReelWriter::finish () boost::filesystem::path video_to; video_to /= _film->dir (_film->dcp_name()); 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); + } } } @@ -330,6 +413,24 @@ ReelWriter::finish () _sound_asset->set_file (audio_to); } + + if (_atmos_asset) { + _atmos_asset_writer->finalize (); + boost::filesystem::path atmos_to; + atmos_to /= _film->dir (_film->dcp_name()); + 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 @@ -349,24 +450,9 @@ 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)); + asset->add_font (j->id(), j->file().get_value_or(default_font_file())); } if (dynamic_pointer_cast (asset)) { @@ -424,6 +510,8 @@ maybe_add_text ( shared_ptr ReelWriter::create_reel (list const & refs, list > const & fonts) { + 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 ()); shared_ptr reel_picture_asset; @@ -453,8 +541,6 @@ ReelWriter::create_reel (list const & refs, listvideo_frame_rate()); DCPOMATIC_ASSERT (reel_picture_asset); @@ -477,9 +563,13 @@ ReelWriter::create_reel (list const & refs, list 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; /* If we have a hash for this asset in the CPL, assume that it is correct */ @@ -516,9 +606,10 @@ ReelWriter::create_reel (list const & refs, listset_language (i->first.language); } - map markers = _film->markers (); - map reel_markers; - for (map::const_iterator i = markers.begin(); i != markers.end(); ++i) { + 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; } @@ -535,6 +626,10 @@ ReelWriter::create_reel (list const & refs, listadd (ma); } + if (_atmos_asset) { + reel->add (shared_ptr(new dcp::ReelAtmosAsset(_atmos_asset, 0))); + } + return reel; } @@ -548,6 +643,10 @@ ReelWriter::calculate_digests (boost::function set_progress) if (_sound_asset) { _sound_asset->hash (set_progress); } + + if (_atmos_asset) { + _atmos_asset->hash (set_progress); + } } Frame @@ -586,12 +685,12 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, } if (!asset) { - string lang = _film->subtitle_language (); + 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); + s->set_language (lang.empty() ? "Unknown" : lang.front().to_string()); } else { s->set_language (track->language); } @@ -600,8 +699,9 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, } 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); + s->set_language (lang.front().to_string()); } else { s->set_language (track->language); } @@ -651,7 +751,7 @@ 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); @@ -664,15 +764,15 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame /* 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);