X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=fa2813837bf065d4f57af3f00575367dedd4f107;hb=ada96204dfa1456da77e2ea7469f492cfc0a5483;hp=8243056f39a31801a53e630b99a1fa7a4293876b;hpb=29d0bfcd3a89b68f52ffd4cee40634acbe4640cd;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 8243056f3..fa2813837 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,7 +23,7 @@ #include "cross.h" #include "job.h" #include "log.h" -#include "md5_digester.h" +#include "digester.h" #include "font.h" #include "compose.hpp" #include "audio_buffers.h" @@ -59,13 +60,18 @@ using dcp::Data; int const ReelWriter::_info_size = 48; -ReelWriter::ReelWriter (shared_ptr film, DCPTimePeriod period, shared_ptr job) +ReelWriter::ReelWriter ( + shared_ptr film, DCPTimePeriod period, shared_ptr job, int reel_index, int reel_count, optional content_summary + ) : _film (film) , _period (period) , _first_nonexistant_frame (0) , _last_written_video_frame (-1) , _last_written_eyes (EYES_RIGHT) , _total_written_audio_frames (0) + , _reel_index (reel_index) + , _reel_count (reel_count) + , _content_summary (content_summary) { /* Create our picture asset in a subdirectory, named according to those film's parameters which affect the video output. We will hard-link @@ -110,7 +116,7 @@ ReelWriter::ReelWriter (shared_ptr film, DCPTimePeriod period, share of the DCP directory until the last minute. */ _sound_asset_writer = _sound_asset->start_write ( - _film->directory() / audio_asset_filename (_sound_asset), + _film->directory() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary), _film->interop() ? dcp::INTEROP : dcp::SMPTE ); } @@ -200,43 +206,11 @@ ReelWriter::check_existing_picture_asset () _first_nonexistant_frame = n; } - bool ok = false; - - while (!ok && _first_nonexistant_frame > 0) { - - LOG_GENERAL ("Checking first nonexistant frame %1", _first_nonexistant_frame); - - /* Read the data from the info file; for 3D we just check the left - frames until we find a good one. - */ - dcp::FrameInfo info = read_frame_info (info_file, _first_nonexistant_frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); - - 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); - 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", _first_nonexistant_frame); - ok = false; - } else { - MD5Digester digester; - digester.add (data.data().get(), 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", _first_nonexistant_frame); - ok = false; - } - } - - if (!ok) { - --_first_nonexistant_frame; - } + while (!existing_picture_frame_ok(asset_file, info_file) && _first_nonexistant_frame > 0) { + --_first_nonexistant_frame; } - if (!_film->three_d() && ok) { + 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. */ @@ -297,7 +271,7 @@ ReelWriter::finish () boost::filesystem::path video_from = _picture_asset->file (); boost::filesystem::path video_to; video_to /= _film->dir (_film->dcp_name()); - video_to /= video_asset_filename (_picture_asset); + video_to /= video_asset_filename (_picture_asset, _reel_index, _reel_count, _content_summary); boost::system::error_code ec; boost::filesystem::create_hard_link (video_from, video_to, ec); @@ -317,13 +291,14 @@ ReelWriter::finish () if (_sound_asset) { boost::filesystem::path audio_to; audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= audio_asset_filename (_sound_asset); + 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 (audio_asset_filename (_sound_asset)), 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 ()), audio_asset_filename (_sound_asset) + String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), aaf ); } @@ -359,8 +334,14 @@ ReelWriter::create_reel (list const & refs, listadd (reel_picture_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 (_sound_asset) { /* We have made a sound asset of our own. Put it into the reel */ reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); @@ -370,6 +351,10 @@ ReelWriter::create_reel (list const & refs, list k = dynamic_pointer_cast (j.asset); if (k && j.period == _period) { reel->add (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()); + } } } } @@ -428,6 +413,10 @@ ReelWriter::create_reel (list const & refs, list k = dynamic_pointer_cast (j.asset); if (k && j.period == _period) { reel->add (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()); + } } } } @@ -436,16 +425,14 @@ ReelWriter::create_reel (list const & refs, list job) +ReelWriter::calculate_digests (boost::function set_progress) { - job->sub (_("Computing image digest")); if (_picture_asset) { - _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + _picture_asset->hash (set_progress); } if (_sound_asset) { - job->sub (_("Computing audio digest")); - _sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + _sound_asset->hash (set_progress); } } @@ -502,3 +489,36 @@ ReelWriter::write (PlayerSubtitles subs) _subtitle_asset->add (i); } } + +bool +ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const +{ + LOG_GENERAL ("Checking existing picture frame %1", _first_nonexistant_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, _first_nonexistant_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); + 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", _first_nonexistant_frame); + ok = false; + } else { + Digester digester; + digester.add (data.data().get(), 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", _first_nonexistant_frame); + ok = false; + } + } + + return ok; +}