#include <dcp/certificate_chain.h>
#include <dcp/interop_subtitle_asset.h>
#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/raw_convert.h>
#include <boost/foreach.hpp>
#include "i18n.h"
using boost::optional;
using boost::dynamic_pointer_cast;
using dcp::Data;
+using dcp::raw_convert;
int const ReelWriter::_info_size = 48;
)
: _film (film)
, _period (period)
- , _first_nonexistant_frame (0)
, _last_written_video_frame (-1)
, _last_written_eyes (EYES_RIGHT)
, _total_written_audio_frames (0)
);
job->sub (_("Checking existing image data"));
- check_existing_picture_asset ();
+ _first_nonexistant_frame = check_existing_picture_asset ();
_picture_asset_writer = _picture_asset->start_write (
_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period),
DCPOMATIC_ASSERT (false);
}
-void
+Frame
ReelWriter::check_existing_picture_asset ()
{
/* Try to open the existing asset */
FILE* asset_file = fopen_boost (_picture_asset->file().get(), "rb");
if (!asset_file) {
LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file()->string(), errno);
- return;
+ return 0;
} else {
LOG_GENERAL ("Opened existing asset at %1", _picture_asset->file()->string());
}
if (!info_file) {
LOG_GENERAL_NC ("Could not open film info file");
fclose (asset_file);
- return;
+ return 0;
}
+ Frame first_nonexistant_frame;
if (_film->three_d ()) {
/* Start looking at the last left frame */
- _first_nonexistant_frame = n / 2;
+ first_nonexistant_frame = n / 2;
} else {
- _first_nonexistant_frame = n;
+ first_nonexistant_frame = n;
}
- while (!existing_picture_frame_ok(asset_file, info_file) && _first_nonexistant_frame > 0) {
- --_first_nonexistant_frame;
+ while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistant_frame) && first_nonexistant_frame > 0) {
+ --first_nonexistant_frame;
}
- if (!_film->three_d() && _first_nonexistant_frame > 0) {
+ 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;
+ ++first_nonexistant_frame;
}
- LOG_GENERAL ("Proceeding with first nonexistant frame %1", _first_nonexistant_frame);
+ LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame);
fclose (asset_file);
fclose (info_file);
+
+ return first_nonexistant_frame;
}
void
LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count);
DCPOMATIC_ASSERT (reel_picture_asset);
- DCPOMATIC_ASSERT (reel_picture_asset->duration() == _period.duration().frames_round (_film->video_frame_rate ()));
+ if (reel_picture_asset->duration() != _period.duration().frames_round (_film->video_frame_rate ())) {
+ throw ProgrammingError (
+ __FILE__, __LINE__,
+ String::compose ("%1 vs %2", reel_picture_asset->duration(), _period.duration().frames_round (_film->video_frame_rate ()))
+ );
+ }
reel->add (reel_picture_asset);
/* If we have a hash for this asset in the CPL, assume that it is correct */
shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
s->set_movie_title (_film->name ());
s->set_language (lang);
- s->set_reel_number ("1");
+ s->set_reel_number (raw_convert<string> (_reel_index + 1));
_subtitle_asset = s;
} else {
shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
s->set_content_title_text (_film->name ());
s->set_language (lang);
s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));
- s->set_reel_number (1);
+ s->set_reel_number (_reel_index + 1);
s->set_time_code_rate (_film->video_frame_rate ());
s->set_start_time (dcp::Time ());
if (_film->encrypted ()) {
}
bool
-ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const
+ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const
{
- LOG_GENERAL ("Checking existing picture frame %1", _first_nonexistant_frame);
+ LOG_GENERAL ("Checking existing picture frame %1", 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);
+ dcp::FrameInfo const info = read_frame_info (info_file, frame, _film->three_d () ? EYES_LEFT : EYES_BOTH);
bool ok = true;
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<size_t> (data.size ())) {
- LOG_GENERAL ("Existing frame %1 is incomplete", _first_nonexistant_frame);
+ LOG_GENERAL ("Existing frame %1 is incomplete", 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);
+ LOG_GENERAL ("Existing frame %1 failed hash check", frame);
ok = false;
}
}