#include "compose.hpp"
#include "referenced_reel_asset.h"
#include "subtitle_content.h"
+#include "player_video.h"
#include <boost/signals2.hpp>
#include <boost/foreach.hpp>
#include <iostream>
* @param f Film that we are transcoding.
* @param j Job that this transcoder is being used in.
*/
-Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
: _film (film)
, _job (j)
, _player (new Player (film, film->playlist ()))
_writer->start ();
_encoder->begin ();
- _job->sub (_("Encoding picture and sound"));
+ {
+ shared_ptr<Job> job = _job.lock ();
+ DCPOMATIC_ASSERT (job);
+ job->sub (_("Encoding picture and sound"));
+ }
DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
DCPTime const length = _film->length ();
}
for (DCPTime t; t < length; t += frame) {
- _encoder->encode (_player->get_video (t, true));
+
+ BOOST_FOREACH (shared_ptr<PlayerVideo> i, _player->get_video (t, true)) {
+ if (!_film->three_d()) {
+ /* 2D DCP */
+ if (i->eyes() == EYES_RIGHT) {
+ /* Discard right-eye images */
+ continue;
+ } else if (i->eyes() == EYES_LEFT) {
+ /* Use left-eye images for both eyes */
+ i->set_eyes (EYES_BOTH);
+ }
+ }
+
+ _encoder->encode (i);
+ }
+
_writer->write (_player->get_audio (t, frame, true));
if (non_burnt_subtitles) {
_writer->write (_player->get_subtitles (t, frame, true, false, true));
}
- _job->set_progress (float(t.get()) / length.get());
+ {
+ shared_ptr<Job> job = _job.lock ();
+ DCPOMATIC_ASSERT (job);
+ job->set_progress (float(t.get()) / length.get());
+ }
}
BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
}
int
-Transcoder::video_frames_out () const
+Transcoder::video_frames_enqueued () const
{
- return _encoder->video_frames_out ();
+ return _encoder->video_frames_enqueued ();
}