X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=f645d6eb5106360de2b84bbcaa76babde5e4f439;hb=05d90a3edda9c1f5e7499f0ce7b6617fe46ac54d;hp=da246ca0aeb25e41ec4ad221ec8edfbed225125b;hpb=98664996b6a7ef62cbff49a174917a456f218e76;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index da246ca0a..f645d6eb5 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -23,10 +23,12 @@ #include "cross.h" #include "job.h" #include "log.h" +#include "dcpomatic_log.h" #include "digester.h" #include "font.h" #include "compose.hpp" #include "audio_buffers.h" +#include "image.h" #include #include #include @@ -36,24 +38,22 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); -#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); -#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING); -#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); - using std::list; using std::string; using std::cout; +using std::map; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; @@ -78,10 +78,12 @@ ReelWriter::ReelWriter ( 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))); + _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))); + _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard)); } _picture_asset->set_size (_film->frame_size ()); @@ -100,13 +102,12 @@ ReelWriter::ReelWriter ( _picture_asset_writer = _picture_asset->start_write ( _film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period), - _film->interop() ? dcp::INTEROP : dcp::SMPTE, _first_nonexistant_frame > 0 ); if (_film->audio_channels ()) { _sound_asset.reset ( - new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()) + new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard) ); if (_film->encrypted ()) { @@ -119,8 +120,7 @@ ReelWriter::ReelWriter ( 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->interop() ? dcp::INTEROP : dcp::SMPTE + _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary) ); } } @@ -134,17 +134,6 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const bool const read = boost::filesystem::exists (info_file); -#ifdef DCPOMATIC_WINDOWS - if (read) { - LOG_GENERAL ( - "Checked %1 (which exists) length is %2 perms are %3", - info_file, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions()) - ); - } else { - LOG_GENERAL ("Checked %1 (which does not exist)", info_file); - } -#endif - if (read) { file = fopen_boost (info_file, "r+b"); } else { @@ -165,11 +154,11 @@ ReelWriter::read_frame_info (FILE* file, Frame frame, Eyes eyes) const { dcp::FrameInfo info; dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); - fread (&info.offset, sizeof (info.offset), 1, file); - fread (&info.size, sizeof (info.size), 1, file); + checked_fread (&info.offset, sizeof(info.offset), file, _film->info_file(_period)); + checked_fread (&info.size, sizeof(info.size), file, _film->info_file(_period)); char hash_buffer[33]; - fread (hash_buffer, 1, 32, file); + checked_fread (hash_buffer, 32, file, _film->info_file(_period)); hash_buffer[32] = '\0'; info.hash = hash_buffer; @@ -341,6 +330,95 @@ ReelWriter::finish () } } +template +shared_ptr +maybe_add_text ( + shared_ptr asset, + int64_t picture_duration, + shared_ptr reel, + list const & refs, + list > const & fonts, + shared_ptr film, + DCPTimePeriod period + ) +{ + Frame const period_duration = period.duration().frames_round(film->video_frame_rate()); + + 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 all the fonts to the subtitle content */ + BOOST_FOREACH (shared_ptr j, fonts) { + asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal)); + } + + if (dynamic_pointer_cast (asset)) { + boost::filesystem::path directory = film->dir (film->dcp_name ()) / asset->id (); + boost::filesystem::create_directories (directory); + asset->write (directory / ("sub_" + asset->id() + ".xml")); + } else { + /* 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 ( + film->dir(film->dcp_name()) / ("sub_" + asset->id() + ".mxf") + ); + } + + reel_asset.reset ( + new T ( + asset, + 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); + if (k && j.period == period) { + 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()); + } + } + } + } + + if (reel_asset) { + if (reel_asset->duration() != period_duration) { + throw ProgrammingError ( + __FILE__, __LINE__, + String::compose ("%1 vs %2", reel_asset->duration(), period_duration) + ); + } + reel->add (reel_asset); + } + + return reel_asset; +} + shared_ptr ReelWriter::create_reel (list const & refs, list > const & fonts) { @@ -427,80 +505,13 @@ ReelWriter::create_reel (list const & refs, listadd (reel_sound_asset); - shared_ptr reel_subtitle_asset; - - if (_subtitle_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 all the fonts to the subtitle content */ - BOOST_FOREACH (shared_ptr j, fonts) { - _subtitle_asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal)); - } - - if (dynamic_pointer_cast (_subtitle_asset)) { - boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id (); - boost::filesystem::create_directories (directory); - _subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml")); - } else { - - /* 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(_subtitle_asset)->set_intrinsic_duration ( - reel_picture_asset->duration () - ); - - _subtitle_asset->write ( - _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") - ); - } - - reel_subtitle_asset.reset ( - new dcp::ReelSubtitleAsset ( - _subtitle_asset, - dcp::Fraction (_film->video_frame_rate(), 1), - reel_picture_asset->duration(), - 0 - ) + maybe_add_text (_subtitle_asset, reel_picture_asset->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->duration(), reel, refs, fonts, _film, _period ); - } 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); - if (k && j.period == _period) { - reel_subtitle_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()); - } - } - } - } - - if (reel_subtitle_asset) { - if (reel_subtitle_asset->duration() != period_duration) { - throw ProgrammingError ( - __FILE__, __LINE__, - String::compose ("%1 vs %2", reel_subtitle_asset->duration(), period_duration) - ); - } - reel->add (reel_subtitle_asset); + a->set_annotation_text (i->first.name); + a->set_language (i->first.language); } return reel; @@ -537,9 +548,23 @@ ReelWriter::write (shared_ptr audio) } void -ReelWriter::write (PlayerSubtitles subs) +ReelWriter::write (PlayerText subs, TextType type, optional track, DCPTimePeriod period) { - if (!_subtitle_asset) { + shared_ptr asset; + + switch (type) { + case TEXT_OPEN_SUBTITLE: + asset = _subtitle_asset; + break; + case TEXT_CLOSED_CAPTION: + DCPOMATIC_ASSERT (track); + asset = _closed_caption_assets[*track]; + break; + default: + DCPOMATIC_ASSERT (false); + } + + if (!asset) { string lang = _film->subtitle_language (); if (lang.empty ()) { lang = "Unknown"; @@ -549,7 +574,7 @@ ReelWriter::write (PlayerSubtitles subs) s->set_movie_title (_film->name ()); s->set_language (lang); s->set_reel_number (raw_convert (_reel_index + 1)); - _subtitle_asset = s; + asset = s; } else { shared_ptr s (new dcp::SMPTESubtitleAsset ()); s->set_content_title_text (_film->name ()); @@ -561,14 +586,41 @@ ReelWriter::write (PlayerSubtitles subs) if (_film->encrypted ()) { s->set_key (_film->key ()); } - _subtitle_asset = s; + asset = s; } } - BOOST_FOREACH (SubtitleString i, subs.text) { + switch (type) { + case TEXT_OPEN_SUBTITLE: + _subtitle_asset = asset; + break; + case TEXT_CLOSED_CAPTION: + DCPOMATIC_ASSERT (track); + _closed_caption_assets[*track] = asset; + break; + default: + 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)); - _subtitle_asset->add (i); + asset->add (shared_ptr(new dcp::SubtitleString(i))); + } + + BOOST_FOREACH (BitmapText 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(), dcp::Time() + ) + ) + ); } }