ExportFormat format,
bool mixdown_to_stereo,
bool split_reels,
+ bool audio_stream_per_channel,
int x264_crf
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key> key
: Encoder (film, job)
, _history (200)
{
+ _player->set_always_burn_open_subtitles ();
+ _player->set_play_referenced ();
+
+ int const ch = film->audio_channels ();
+
+ AudioMapping map;
+ if (mixdown_to_stereo) {
+ _output_audio_channels = 2;
+ map = AudioMapping (ch, 2);
+ float const overall_gain = 2 / (4 + sqrt(2));
+ float const minus_3dB = 1 / sqrt(2);
+ if (ch == 2) {
+ map.set (dcp::LEFT, 0, 1);
+ map.set (dcp::RIGHT, 1, 1);
+ } else if (ch == 4) {
+ map.set (dcp::LEFT, 0, overall_gain);
+ map.set (dcp::RIGHT, 1, overall_gain);
+ map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+ map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+ map.set (dcp::LS, 0, overall_gain);
+ } else if (ch >= 6) {
+ map.set (dcp::LEFT, 0, overall_gain);
+ map.set (dcp::RIGHT, 1, overall_gain);
+ map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+ map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+ map.set (dcp::LS, 0, overall_gain);
+ map.set (dcp::RS, 1, overall_gain);
+ }
+ /* XXX: maybe we should do something better for >6 channel DCPs */
+ } else {
+ /* Our encoders don't really want to encode any channel count between 9 and 15 inclusive,
+ * so let's just use 16 channel exports for any project with more than 8 channels.
+ */
+ _output_audio_channels = ch > 8 ? 16 : ch;
+ map = AudioMapping (ch, _output_audio_channels);
+ for (int i = 0; i < ch; ++i) {
+ map.set (i, i, 1);
+ }
+ }
+
+ _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+
int const files = split_reels ? film->reels().size() : 1;
for (int i = 0; i < files; ++i) {
_film->frame_size(),
_film->video_frame_rate(),
_film->audio_frame_rate(),
- mixdown_to_stereo ? 2 : film->audio_channels(),
+ _output_audio_channels,
format,
+ audio_stream_per_channel,
x264_crf,
_film->three_d(),
filename,
)
);
}
-
- _player->set_always_burn_open_subtitles ();
- _player->set_play_referenced ();
-
- int const ch = film->audio_channels ();
-
- AudioMapping map;
- if (mixdown_to_stereo) {
- _output_audio_channels = 2;
- map = AudioMapping (ch, 2);
- float const overall_gain = 2 / (4 + sqrt(2));
- float const minus_3dB = 1 / sqrt(2);
- map.set (dcp::LEFT, 0, overall_gain);
- map.set (dcp::RIGHT, 1, overall_gain);
- map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
- map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
- map.set (dcp::LS, 0, overall_gain);
- map.set (dcp::RS, 1, overall_gain);
- } else {
- _output_audio_channels = ch;
- map = AudioMapping (ch, ch);
- for (int i = 0; i < ch; ++i) {
- map.set (i, i, 1);
- }
- }
-
- _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
}
+
void
FFmpegEncoder::go ()
{
}
for (int j = 0; j < gets_per_frame; ++j) {
- pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, 0);
+ Butler::Error e;
+ pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, &e);
+ _butler->rethrow ();
+ if (!v.first) {
+ throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", e.summary()));
+ }
shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
if (fe) {
fe->video(v.first, v.second);
int audio_frame_rate,
int channels,
ExportFormat format,
+ bool audio_stream_per_channel,
int x264_crf,
bool three_d,
boost::filesystem::path output,
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, 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,
+ audio_stream_per_channel, 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 "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, 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,
+ audio_stream_per_channel, 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, format, x264_crf, String::compose("%1%2", output.string(), extension)
+ new FFmpegFileEncoder(
+ video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
+ audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension)
#ifdef DCPOMATIC_VARIANT_SWAROOP
, key, id
#endif
projects / dcpomatic.git / blobdiff