X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=31860e8816131da9973231612a19d415866001d9;hb=640e30afec63fe0ceab064c1082450a77c75f9d3;hp=7a2c9c67087b68d3b500817de039303042ca293b;hpb=7ec6c86c913fba820870565ee757fdf43ae47433;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 7a2c9c670..31860e881 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -26,7 +26,6 @@ #include "dcpomatic_log.h" #include "digester.h" #include "film.h" -#include "font_data.h" #include "image.h" #include "image_png.h" #include "job.h" @@ -115,6 +114,7 @@ ReelWriter::ReelWriter ( , _content_summary (film()->content_summary(period)) , _job (job) , _text_only (text_only) + , _font_metrics(film()->frame_size().height) { /* Create or find our picture asset in a subdirectory, named according to those film's parameters which affect the video @@ -126,9 +126,9 @@ ReelWriter::ReelWriter ( boost::filesystem::path const asset = film()->internal_video_asset_dir() / film()->internal_video_asset_filename(_period); - _first_nonexistant_frame = check_existing_picture_asset (asset); + _first_nonexistent_frame = check_existing_picture_asset (asset); - if (_first_nonexistant_frame < period.duration().frames_round(film()->video_frame_rate())) { + if (_first_nonexistent_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 @@ -161,7 +161,7 @@ ReelWriter::ReelWriter ( } _picture_asset->set_file (asset); - _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0); + _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistent_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? */ @@ -195,7 +195,8 @@ ReelWriter::ReelWriter ( */ _sound_asset_writer = _sound_asset->start_write ( film()->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary), - film()->contains_atmos_content() + film()->contains_atmos_content(), + !film()->limit_to_smpte_bv20() ); } @@ -208,10 +209,10 @@ void ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const { 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()); - checked_fwrite (info.hash.c_str(), info.hash.size(), handle->get(), handle->file()); + handle->get().seek(frame_info_position(frame, eyes), SEEK_SET); + handle->get().checked_write(&info.offset, sizeof(info.offset)); + handle->get().checked_write(&info.size, sizeof(info.size)); + handle->get().checked_write(info.hash.c_str(), info.hash.size()); } @@ -219,12 +220,12 @@ dcp::FrameInfo ReelWriter::read_frame_info (shared_ptr info, Frame frame, Eyes eyes) const { 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()); + info->get().seek(frame_info_position(frame, eyes), SEEK_SET); + info->get().checked_read(&frame_info.offset, sizeof(frame_info.offset)); + info->get().checked_read(&frame_info.size, sizeof(frame_info.size)); char hash_buffer[33]; - checked_fread (hash_buffer, 32, info->get(), info->file()); + info->get().checked_read(hash_buffer, 32); hash_buffer[32] = '\0'; frame_info.hash = hash_buffer; @@ -260,7 +261,7 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset) } /* Try to open the existing asset */ - auto asset_file = fopen_boost (asset, "rb"); + dcp::File asset_file(asset, "rb"); if (!asset_file) { LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", asset.string(), errno); return 0; @@ -274,38 +275,35 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset) 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); + int const n = (boost::filesystem::file_size(info_file->get().path()) / _info_size) - 1; + LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size(info_file->get().path()), _info_size); - Frame first_nonexistant_frame; + Frame first_nonexistent_frame; if (film()->three_d()) { /* Start looking at the last left frame */ - first_nonexistant_frame = n / 2; + first_nonexistent_frame = n / 2; } else { - first_nonexistant_frame = n; + first_nonexistent_frame = n; } - while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistant_frame) && first_nonexistant_frame > 0) { - --first_nonexistant_frame; + while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistent_frame) && first_nonexistent_frame > 0) { + --first_nonexistent_frame; } - if (!film()->three_d() && first_nonexistant_frame > 0) { + if (!film()->three_d() && first_nonexistent_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. */ - ++first_nonexistant_frame; + ++first_nonexistent_frame; } - LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame); + LOG_GENERAL ("Proceeding with first nonexistent frame %1", first_nonexistent_frame); - fclose (asset_file); - - return first_nonexistant_frame; + return first_nonexistent_frame; } @@ -319,7 +317,7 @@ ReelWriter::write (shared_ptr encoded, Frame frame, Eyes eyes) auto fin = _picture_asset_writer->write (encoded->data(), encoded->size()); write_frame_info (frame, eyes, fin); - _last_written[static_cast(eyes)] = encoded; + _last_written[eyes] = encoded; } @@ -359,10 +357,7 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes) return; } - auto fin = _picture_asset_writer->write ( - _last_written[static_cast(eyes)]->data(), - _last_written[static_cast(eyes)]->size() - ); + auto fin = _picture_asset_writer->write(_last_written[eyes]->data(), _last_written[eyes]->size()); write_frame_info (frame, eyes, fin); } @@ -395,7 +390,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"); + LOG_WARNING("Hard-link failed (%1); copying instead", error_details(ec)); auto job = _job.lock (); if (job) { job->sub (_("Copying video file into DCP")); @@ -408,7 +403,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) } 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()); + LOG_ERROR("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), error_details(ec)); throw FileError (ec.message(), video_from); } } @@ -427,7 +422,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) 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 + String::compose(_("could not move audio asset into the DCP (%1)"), error_details(ec)), aaf ); } @@ -444,7 +439,7 @@ ReelWriter::finish (boost::filesystem::path output_dcp) 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 + String::compose(_("could not move atmos asset into the DCP (%1)"), error_details(ec)), aaf ); } @@ -462,8 +457,12 @@ maybe_add_text ( shared_ptr asset, int64_t picture_duration, shared_ptr reel, + int reel_index, + int reel_count, + optional content_summary, list const & refs, - vector const & fonts, + FontIdMap const& fonts, + shared_ptr chosen_interop_font, dcp::ArrayData default_font, shared_ptr film, DCPTimePeriod period, @@ -476,15 +475,23 @@ maybe_add_text ( shared_ptr reel_asset; if (asset) { - /* Add the font to the subtitle content */ - for (auto const& j: fonts) { - asset->add_font (j.id, j.data.get_value_or(default_font)); + if (film->interop()) { + if (chosen_interop_font) { + /* We only add one font, as Interop will ignore subsequent ones (and some validators will + * complain if they are even present) + */ + asset->add_font(fonts.get(chosen_interop_font), chosen_interop_font->data().get_value_or(default_font)); + } + } else { + for (auto const& font: fonts.map()) { + asset->add_font(font.second, font.first->data().get_value_or(default_font)); + } } if (auto interop = dynamic_pointer_cast(asset)) { auto directory = output_dcp / interop->id (); boost::filesystem::create_directories (directory); - interop->write (directory / ("sub_" + interop->id() + ".xml")); + interop->write (directory / subtitle_asset_filename(asset, reel_index, reel_count, content_summary, ".xml")); reel_asset = make_shared ( interop, dcp::Fraction(film->video_frame_rate(), 1), @@ -499,7 +506,7 @@ maybe_add_text ( */ smpte->set_intrinsic_duration(picture_duration); smpte->write ( - output_dcp / ("sub_" + asset->id() + ".mxf") + output_dcp / subtitle_asset_filename(asset, reel_index, reel_count, content_summary, ".mxf") ); reel_asset = make_shared ( smpte, @@ -638,7 +645,8 @@ void ReelWriter::create_reel_text ( shared_ptr reel, list const & refs, - vector const& fonts, + FontIdMap const& fonts, + shared_ptr chosen_interop_font, int64_t duration, boost::filesystem::path output_dcp, bool ensure_subtitles, @@ -646,7 +654,7 @@ ReelWriter::create_reel_text ( ) const { auto subtitle = maybe_add_text ( - _subtitle_asset, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only + _subtitle_asset, duration, reel, _reel_index, _reel_count, _content_summary, refs, fonts, chosen_interop_font, _default_font, film(), _period, output_dcp, _text_only ); if (subtitle) { @@ -660,8 +668,12 @@ ReelWriter::create_reel_text ( empty_text_asset(TextType::OPEN_SUBTITLE, optional(), true), duration, reel, + _reel_index, + _reel_count, + _content_summary, refs, fonts, + chosen_interop_font, _default_font, film(), _period, @@ -672,7 +684,7 @@ ReelWriter::create_reel_text ( 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 + i.second, duration, reel, _reel_index, _reel_count, _content_summary, refs, fonts, chosen_interop_font, _default_font, film(), _period, output_dcp, _text_only ); DCPOMATIC_ASSERT (a); a->set_annotation_text (i.first.name); @@ -686,7 +698,20 @@ ReelWriter::create_reel_text ( /* Make empty tracks for anything we've been asked to ensure but that we haven't added */ 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 + empty_text_asset(TextType::CLOSED_CAPTION, i, true), + duration, + reel, + _reel_index, + _reel_count, + _content_summary, + refs, + fonts, + chosen_interop_font, + _default_font, + film(), + _period, + output_dcp, + _text_only ); DCPOMATIC_ASSERT (a); a->set_annotation_text (i.name); @@ -727,7 +752,8 @@ ReelWriter::create_reel_markers (shared_ptr reel) const shared_ptr ReelWriter::create_reel ( list const & refs, - vector const & fonts, + FontIdMap const & fonts, + shared_ptr chosen_interop_font, boost::filesystem::path output_dcp, bool ensure_subtitles, set ensure_closed_captions @@ -749,7 +775,7 @@ ReelWriter::create_reel ( create_reel_markers (reel); } - create_reel_text (reel, refs, fonts, duration, output_dcp, ensure_subtitles, ensure_closed_captions); + create_reel_text (reel, refs, fonts, chosen_interop_font, duration, output_dcp, ensure_subtitles, ensure_closed_captions); if (_atmos_asset) { reel->add (make_shared(_atmos_asset, 0)); @@ -831,41 +857,71 @@ ReelWriter::empty_text_asset (TextType type, optional track, bool 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; } + if (with_dummy) { + asset->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, + 0, + dcp::Direction::LTR, + " ", + dcp::Effect::NONE, + dcp::Colour(), + dcp::Time(), + dcp::Time(), + 0 + ) + ); + } + return asset; } +float +ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const +{ + if (dcp::uses_baseline(subtitle.valign_standard) == dcp::uses_baseline(to)) { + /* The from and to standards use the same alignment reference */ + return subtitle.v_position(); + } + + auto const baseline_to_bottom = _font_metrics.baseline_to_bottom(subtitle); + auto const height = _font_metrics.height(subtitle); + + float correction = 0; + switch (subtitle.v_align()) { + case dcp::VAlign::TOP: + correction = height - baseline_to_bottom; + break; + case dcp::VAlign::CENTER: + correction = (height / 2) - baseline_to_bottom; + break; + case dcp::VAlign::BOTTOM: + correction = baseline_to_bottom; + break; + } + + return subtitle.v_position() + (dcp::uses_bounding_box(subtitle.valign_standard) ? correction : -correction); +} + + void -ReelWriter::write (PlayerText subs, TextType type, optional track, DCPTimePeriod period) +ReelWriter::write (PlayerText subs, TextType type, optional track, DCPTimePeriod period, FontIdMap const& fonts) { shared_ptr asset; @@ -903,7 +959,12 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, 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)); + i.set_v_position(convert_vertical_position(i, film()->interop() ? dcp::SubtitleStandard::INTEROP : dcp::SubtitleStandard::SMPTE_2014)); + auto sub = make_shared(i); + if (type == TextType::OPEN_SUBTITLE) { + sub->set_font(fonts.get(i.font)); + } + asset->add(sub); } for (auto i: subs.bitmap) { @@ -912,7 +973,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, image_as_png(i.image), 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, + i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, 0, dcp::Time(), dcp::Time() ) ); @@ -921,7 +982,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, bool -ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr info_file, Frame frame) const +ReelWriter::existing_picture_frame_ok (dcp::File& asset_file, shared_ptr info_file, Frame frame) const { LOG_GENERAL ("Checking existing picture frame %1", frame); @@ -933,9 +994,9 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr (data.size ())) { LOG_GENERAL ("Existing frame %1 is incomplete", frame);