From d4edaca0842cc7e51fbfdd6d054a499b52c1424b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Jul 2018 23:20:57 +0100 Subject: [PATCH] Untested writing of CCAP. --- src/lib/reel_writer.cc | 181 ++++++++++++++++++++++------------------- src/lib/reel_writer.h | 2 +- 2 files changed, 99 insertions(+), 84 deletions(-) diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 3cd4f7f46..1836b6543 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. @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -332,6 +333,95 @@ ReelWriter::finish () } } +template +void +maybe_add_captions ( + 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); + } +} + shared_ptr ReelWriter::create_reel (list const & refs, list > const & fonts) { @@ -418,81 +508,8 @@ 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 - ) - ); - } 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); - } + maybe_add_captions (_caption_asset[CAPTION_OPEN], reel_picture_asset->duration(), reel, refs, fonts, _film, _period); + maybe_add_captions (_caption_asset[CAPTION_CLOSED], reel_picture_asset->duration(), reel, refs, fonts, _film, _period); return reel; } @@ -530,9 +547,7 @@ ReelWriter::write (shared_ptr audio) void ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) { - /* XXX: we need separate libdcp asset types here and to know how different they are */ - - if (!_subtitle_asset) { + if (!_caption_asset[type]) { string lang = _film->subtitle_language (); if (lang.empty ()) { lang = "Unknown"; @@ -542,7 +557,7 @@ ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) s->set_movie_title (_film->name ()); s->set_language (lang); s->set_reel_number (raw_convert (_reel_index + 1)); - _subtitle_asset = s; + _caption_asset[type] = s; } else { shared_ptr s (new dcp::SMPTESubtitleAsset ()); s->set_content_title_text (_film->name ()); @@ -554,7 +569,7 @@ ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) if (_film->encrypted ()) { s->set_key (_film->key ()); } - _subtitle_asset = s; + _caption_asset[type] = s; } } @@ -562,11 +577,11 @@ ReelWriter::write (PlayerCaption subs, CaptionType type, DCPTimePeriod period) /* 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 (shared_ptr(new dcp::SubtitleString(i))); + _caption_asset[type]->add (shared_ptr(new dcp::SubtitleString(i))); } BOOST_FOREACH (BitmapCaption i, subs.image) { - _subtitle_asset->add ( + _caption_asset[type]->add ( shared_ptr( new dcp::SubtitleImage( i.image->as_png(), diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 06f19f15a..24a5e9a8a 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -113,7 +113,7 @@ private: boost::shared_ptr _picture_asset_writer; boost::shared_ptr _sound_asset; boost::shared_ptr _sound_asset_writer; - boost::shared_ptr _subtitle_asset; + boost::shared_ptr _caption_asset[CAPTION_COUNT]; static int const _info_size; }; -- 2.30.2