using boost::shared_ptr;
using boost::bind;
using boost::weak_ptr;
+using boost::optional;
+using namespace dcpomatic;
+/** @param key Key to use to encrypt MP4 outputs */
FFmpegEncoder::FFmpegEncoder (
shared_ptr<const Film> film,
weak_ptr<Job> job,
bool mixdown_to_stereo,
bool split_reels,
int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , optional<dcp::Key> key
+ , optional<string> id
+#endif
)
: Encoder (film, job)
- , _history (1000)
+ , _history (200)
{
int const files = split_reels ? film->reels().size() : 1;
for (int i = 0; i < files; ++i) {
_film->video_frame_rate(),
_film->audio_frame_rate(),
mixdown_to_stereo ? 2 : film->audio_channels(),
- _film->log(),
format,
x264_crf,
_film->three_d(),
filename,
extension
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , key
+ , id
+#endif
)
);
}
}
}
- _butler.reset (new Butler (_player, film->log(), map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+ _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
}
void
job->sub (_("Encoding"));
}
+ Waker waker;
+
list<DCPTimePeriod> reel_periods = _film->reels ();
list<DCPTimePeriod>::const_iterator reel = reel_periods.begin ();
list<FileEncoderSet>::iterator encoder = _file_encoders.begin ();
}
for (int j = 0; j < gets_per_frame; ++j) {
- pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video ();
- encoder->get(v.first->eyes())->video(v.first, v.second);
+ Butler::Error e;
+ pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, &e);
+ if (!v.first) {
+ throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast<int>(e)));
+ }
+ shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
+ if (fe) {
+ fe->video(v.first, v.second);
+ }
}
_history.event ();
job->set_progress (float(i.get()) / _film->length().get());
}
+ waker.nudge ();
+
_butler->get_audio (interleaved, audio_frames);
/* XXX: inefficient; butler interleaves and we deinterleave again */
float* p = interleaved;
}
}
-float
+optional<float>
FFmpegEncoder::current_rate () const
{
return _history.rate ();
int video_frame_rate,
int audio_frame_rate,
int channels,
- shared_ptr<Log> log,
ExportFormat format,
int x264_crf,
bool three_d,
boost::filesystem::path output,
string extension
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , optional<dcp::Key> key
+ , optional<string> id
+#endif
)
{
if (three_d) {
/// TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
_encoders[EYES_LEFT] = shared_ptr<FFmpegFileEncoder>(
- new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension))
+ new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , key, id
+#endif
+ )
);
- /// TRANSLATORS: R here is an abbreviation for "left", to indicate the left-eye part of a 3D export
+ /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
_encoders[EYES_RIGHT] = shared_ptr<FFmpegFileEncoder>(
- new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension))
+ new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , key, id
+#endif
+ )
);
} else {
_encoders[EYES_BOTH] = shared_ptr<FFmpegFileEncoder>(
- new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1%2", output.string(), extension))
+ new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1%2", output.string(), extension)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , key, id
+#endif
+ )
);
}
}
shared_ptr<FFmpegFileEncoder>
FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
{
+ if (_encoders.size() == 1) {
+ /* We are doing a 2D export... */
+ if (eyes == EYES_LEFT) {
+ /* ...but we got some 3D data; put the left eye into the output... */
+ eyes = EYES_BOTH;
+ } else if (eyes == EYES_RIGHT) {
+ /* ...and ignore the right eye.*/
+ return shared_ptr<FFmpegFileEncoder>();
+ }
+ }
+
map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
DCPOMATIC_ASSERT (i != _encoders.end());
return i->second;