X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=d707550bbf3599e1270d44c5dd55852b1d902760;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=a7e3097f367187437c50cb55a894e49798c8ee4e;hpb=2175471d37831108a25e3e74b956192c64e68e39;p=dcpomatic.git diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index a7e3097f3..d707550bb 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 . */ @@ -51,9 +52,11 @@ using std::list; using std::string; +using std::cout; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::Data; int const ReelWriter::_info_size = 48; @@ -176,10 +179,13 @@ ReelWriter::check_existing_picture_asset () if (!asset_file) { LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno); return; + } else { + LOG_GENERAL ("Opened existing asset at %1", _picture_asset->file().string()); } /* Offset of the last dcp::FrameInfo in the info file */ int const n = (boost::filesystem::file_size (_film->info_file(_period)) / _info_size) - 1; + LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size (_film->info_file(_period)), _info_size); FILE* info_file = fopen_boost (_film->info_file(_period), "rb"); if (!info_file) { @@ -195,44 +201,19 @@ ReelWriter::check_existing_picture_asset () _first_nonexistant_frame = n; } - bool ok = false; - - while (!ok) { - /* 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); - 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()); - 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 ()) { + 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. */ ++_first_nonexistant_frame; } + LOG_GENERAL ("Proceeding with first nonexistant frame %1", _first_nonexistant_frame); + fclose (asset_file); fclose (info_file); } @@ -366,7 +347,11 @@ ReelWriter::create_reel (list const & refs, list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_asset->add (*i); + BOOST_FOREACH (dcp::SubtitleString i, subs.text) { + 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); + } +} + +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 { + 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; + } } + + return ok; }