X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=eff5c48eeede1342e2b61f2dee07abb9f3abbd74;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=7ffc773a14b41ddea11e4d2d8b64de48279bcba9;hpb=9fe5ea488461355a779db1b6b56f93ef375bac41;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 7ffc773a1..eff5c48ee 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 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" @@ -41,6 +42,7 @@ #include #include #include +#include #include "i18n.h" @@ -53,6 +55,7 @@ using std::list; using std::string; using std::cout; using boost::shared_ptr; +using boost::make_shared; using boost::optional; using boost::dynamic_pointer_cast; using dcp::Data; @@ -200,7 +203,7 @@ ReelWriter::check_existing_picture_asset () _first_nonexistant_frame = n; } - while (!existing_picture_frame_ok(asset_file, info_file, _first_nonexistant_frame) && _first_nonexistant_frame > 0) { + while (!existing_picture_frame_ok(asset_file, info_file) && _first_nonexistant_frame > 0) { --_first_nonexistant_frame; } @@ -211,12 +214,6 @@ ReelWriter::check_existing_picture_asset () ++_first_nonexistant_frame; } - for (int i = 0; i < _first_nonexistant_frame; ++i) { - if (!existing_picture_frame_ok(asset_file, info_file, i)) { - LOG_GENERAL ("Although %1 is not ok", i); - } - } - LOG_GENERAL ("Proceeding with first nonexistant frame %1", _first_nonexistant_frame); fclose (asset_file); @@ -308,7 +305,7 @@ ReelWriter::finish () shared_ptr ReelWriter::create_reel (list const & refs, list > const & fonts) { - shared_ptr reel (new dcp::Reel ()); + shared_ptr reel = make_shared (); shared_ptr reel_picture_asset; @@ -334,16 +331,24 @@ 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))); + reel->add (make_shared (_sound_asset, 0)); } else { /* We don't have a sound 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->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()); + } } } } @@ -402,6 +407,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()); + } } } } @@ -453,13 +462,13 @@ ReelWriter::write (PlayerSubtitles subs) lang = "Unknown"; } if (_film->interop ()) { - shared_ptr s (new dcp::InteropSubtitleAsset ()); + shared_ptr s = make_shared (); s->set_movie_title (_film->name ()); s->set_language (lang); s->set_reel_number ("1"); _subtitle_asset = s; } else { - shared_ptr s (new dcp::SMPTESubtitleAsset ()); + shared_ptr s = make_shared (); s->set_content_title_text (_film->name ()); s->set_language (lang); s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); @@ -478,14 +487,14 @@ ReelWriter::write (PlayerSubtitles subs) } bool -ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, int frame) const +ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const { - LOG_GENERAL ("Checking existing picture frame %1", frame); + 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, frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); + dcp::FrameInfo const info = read_frame_info (info_file, _first_nonexistant_frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); bool ok = true; @@ -495,14 +504,14 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, int fr 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", frame); + LOG_GENERAL ("Existing frame %1 is incomplete", _first_nonexistant_frame); ok = false; } else { - MD5Digester digester; + 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", frame); + LOG_GENERAL ("Existing frame %1 failed hash check", _first_nonexistant_frame); ok = false; } }