, _finish (false)
, _queued_full_in_memory (0)
, _last_written_frame (-1)
+ , _last_written_eyes (EYES_RIGHT)
, _full_written (0)
, _fake_written (0)
, _repeat_written (0)
film's parameters which affect the video output. We will hard-link
it into the DCP later.
*/
-
- _picture_asset.reset (
- new libdcp::MonoPictureAsset (
- _film->internal_video_mxf_dir (),
- _film->internal_video_mxf_filename (),
- _film->dcp_video_frame_rate (),
- _film->container()->size (_film->full_frame ())
- )
- );
- _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
+ if (f->three_d ()) {
+ _picture_asset.reset (
+ new libdcp::StereoPictureAsset (
+ _film->internal_video_mxf_dir (),
+ _film->internal_video_mxf_filename (),
+ _film->video_frame_rate (),
+ _film->container()->size (_film->full_frame ())
+ )
+ );
+
+ } else {
+ _picture_asset.reset (
+ new libdcp::MonoPictureAsset (
+ _film->internal_video_mxf_dir (),
+ _film->internal_video_mxf_filename (),
+ _film->video_frame_rate (),
+ _film->container()->size (_film->full_frame ())
+ )
+ );
+ }
+
+ _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
+
_sound_asset.reset (
new libdcp::SoundAsset (
_film->dir (_film->dcp_name()),
- _film->dcp_audio_mxf_filename (),
- _film->dcp_video_frame_rate (),
- _film->dcp_audio_channels (),
- _film->dcp_audio_frame_rate ()
+ _film->audio_mxf_filename (),
+ _film->video_frame_rate (),
+ _film->audio_channels (),
+ _film->audio_frame_rate ()
)
);
qi.type = QueueItem::FULL;
qi.encoded = encoded;
qi.frame = frame;
- qi.eyes = eyes;
- _queue.push_back (qi);
- ++_queued_full_in_memory;
+ if (_film->three_d() && eyes == EYES_BOTH) {
+ /* 2D material in a 3D DCP; fake the 3D */
+ qi.eyes = EYES_LEFT;
+ _queue.push_back (qi);
+ ++_queued_full_in_memory;
+ qi.eyes = EYES_RIGHT;
+ _queue.push_back (qi);
+ ++_queued_full_in_memory;
+ } else {
+ qi.eyes = eyes;
+ _queue.push_back (qi);
+ ++_queued_full_in_memory;
+ }
+
_condition.notify_all ();
}
_sound_asset_writer->write (audio->data(), audio->frames());
}
-/** This must be called from Writer::thread() with an appropriate lock held */
+/** This must be called from Writer::thread() with an appropriate lock held,
+ * and with _queue sorted.
+ */
bool
Writer::have_sequenced_image_at_queue_head () const
{
return false;
}
- /* We assume that we will get either all 2D frames or all 3D frames, not a mixture */
-
- bool const eyes_ok = (_queue.front().eyes == EYES_BOTH) ||
- (_queue.front().eyes == EYES_LEFT && _last_written_eyes == EYES_RIGHT) ||
- (_queue.front().eyes == EYES_RIGHT && _last_written_eyes == EYES_LEFT);
-
- return _queue.front().frame == (_last_written_frame + 1) && eyes_ok;
+ /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */
+
+ if (_queue.front().eyes == EYES_BOTH) {
+ /* 2D */
+ return _queue.front().frame == (_last_written_frame + 1);
+ }
+
+ /* 3D */
+
+ if (_last_written_eyes == EYES_LEFT && _queue.front().frame == _last_written_frame && _queue.front().eyes == EYES_RIGHT) {
+ return true;
+ }
+
+ if (_last_written_eyes == EYES_RIGHT && _queue.front().frame == (_last_written_frame + 1) && _queue.front().eyes == EYES_LEFT) {
+ return true;
+ }
+
+ return false;
}
void
if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
break;
}
-
+
TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
_condition.wait (lock);
TIMING (N_("writer wakes with a queue of %1"), _queue.size());
if (!qi.encoded) {
qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
}
- libdcp::FrameInfo const fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
+
+ libdcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
- _last_written = qi.encoded;
+ _last_written[qi.eyes] = qi.encoded;
++_full_written;
break;
}
case QueueItem::FAKE:
_film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame));
_picture_asset_writer->fake_write (qi.size);
- _last_written.reset ();
+ _last_written[qi.eyes].reset ();
++_fake_written;
break;
case QueueItem::REPEAT:
{
_film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
- libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size());
- _last_written->write_info (_film, qi.frame, qi.eyes, fin);
+ libdcp::FrameInfo fin = _picture_asset_writer->write (
+ _last_written[qi.eyes]->data(),
+ _last_written[qi.eyes]->size()
+ );
+
+ _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
++_repeat_written;
break;
}
}
lock.lock ();
+
+ _last_written_frame = qi.frame;
+ _last_written_eyes = qi.eyes;
if (_film->length()) {
_job->set_progress (
float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
);
}
-
- ++_last_written_frame;
}
while (_queued_full_in_memory > _maximum_frames_in_memory) {
++_pushed_to_disk;
lock.unlock ();
- _film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame));
+
+ _film->log()->log (
+ String::compose (
+ "Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk",
+ _last_written_frame + 1,
+ _last_written_eyes, qi.frame)
+ );
+
qi.encoded->write (_film, qi.frame, qi.eyes);
lock.lock ();
qi.encoded.reset ();
_sound_asset_writer->finalize ();
int const frames = _last_written_frame + 1;
-
+
_picture_asset->set_duration (frames);
/* Hard-link the video MXF into the DCP */
boost::filesystem::path to;
to /= _film->dir (_film->dcp_name());
- to /= _film->dcp_video_mxf_filename ();
+ to /= _film->video_mxf_filename ();
boost::system::error_code ec;
boost::filesystem::create_hard_link (from, to, ec);
/* And update the asset */
_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
- _picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
+ _picture_asset->set_file_name (_film->video_mxf_filename ());
_sound_asset->set_duration (frames);
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
_film->dcp_name(),
_film->dcp_content_type()->libdcp_kind (),
frames,
- _film->dcp_video_frame_rate ()
+ _film->video_frame_rate ()
)
);
/* Read the frame info as written */
ifstream ifi (_film->info_path (f, eyes).c_str());
libdcp::FrameInfo info (ifi);
+ if (info.size == 0) {
+ _film->log()->log (String::compose ("Existing frame %1 has no info file", f));
+ return false;
+ }
/* Read the data from the MXF and hash it */
fseek (mxf, info.offset, SEEK_SET);
while (1) {
- if (_film->dcp_3d ()) {
+ if (_film->three_d ()) {
if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
break;
}
projects / dcpomatic.git / blobdiff