X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=bf7bdbd040d97e920541297b1eb0cef96db6a0fc;hp=6b31c4201901bf5004b7a1efc9a848615799c5fd;hb=HEAD;hpb=a548c40a991a8bf26fb17a9f6563ccc5eb28ea82 diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 6b31c4201..c1170f098 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -59,65 +59,70 @@ FFmpegEncoder::FFmpegEncoder ( int x264_crf ) : Encoder (film, job) + , _output_audio_channels(mixdown_to_stereo ? 2 : (_film->audio_channels() > 8 ? 16 : _film->audio_channels())) , _history (200) , _output (output) , _format (format) , _split_reels (split_reels) , _audio_stream_per_channel (audio_stream_per_channel) , _x264_crf (x264_crf) -{ - _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::Channel::LEFT, 0, 1); - map.set (dcp::Channel::RIGHT, 1, 1); - } else if (ch == 4) { - map.set (dcp::Channel::LEFT, 0, overall_gain); - map.set (dcp::Channel::RIGHT, 1, overall_gain); - map.set (dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); - map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); - map.set (dcp::Channel::LS, 0, overall_gain); - } else if (ch >= 6) { - map.set (dcp::Channel::LEFT, 0, overall_gain); - map.set (dcp::Channel::RIGHT, 1, overall_gain); - map.set (dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); - map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); - map.set (dcp::Channel::LS, 0, overall_gain); - map.set (dcp::Channel::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 = std::make_shared( + , _butler( _film, _player, - map, + mixdown_to_stereo ? stereo_map() : many_channel_map(), _output_audio_channels, - bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), + boost::bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false, Butler::Audio::ENABLED - ); + ) +{ + _player.set_always_burn_open_subtitles(); + _player.set_play_referenced(); +} + + +AudioMapping +FFmpegEncoder::stereo_map() const +{ + auto map = AudioMapping(_film->audio_channels(), 2); + float const overall_gain = 2 / (4 + sqrt(2)); + float const minus_3dB = 1 / sqrt(2); + switch (_film->audio_channels()) { + case 2: + map.set(dcp::Channel::LEFT, 0, 1); + map.set(dcp::Channel::RIGHT, 1, 1); + break; + case 4: + map.set(dcp::Channel::LEFT, 0, overall_gain); + map.set(dcp::Channel::RIGHT, 1, overall_gain); + map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); + map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); + map.set(dcp::Channel::LS, 0, overall_gain); + break; + default: + map.set(dcp::Channel::LEFT, 0, overall_gain); + map.set(dcp::Channel::RIGHT, 1, overall_gain); + map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); + map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); + map.set(dcp::Channel::LS, 0, overall_gain); + map.set(dcp::Channel::RS, 1, overall_gain); + break; + } + return map; +} + + +AudioMapping +FFmpegEncoder::many_channel_map() const +{ + auto map = AudioMapping(_film->audio_channels(), _output_audio_channels); + for (int i = 0; i < _film->audio_channels(); ++i) { + map.set(i, i, 1); + } + return map; } @@ -138,8 +143,8 @@ FFmpegEncoder::go () for (int i = 0; i < files; ++i) { boost::filesystem::path filename = _output; - string extension = boost::filesystem::extension (filename); - filename = boost::filesystem::change_extension (filename, ""); + auto extension = dcp::filesystem::extension(filename); + filename = dcp::filesystem::change_extension(filename, ""); if (files > 1) { /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate @@ -172,9 +177,9 @@ FFmpegEncoder::go () std::vector interleaved(_output_audio_channels * audio_frames); auto deinterleaved = make_shared(_output_audio_channels, audio_frames); int const gets_per_frame = _film->three_d() ? 2 : 1; - for (DCPTime i; i < _film->length(); i += video_frame) { + for (DCPTime time; time < _film->length(); time += video_frame) { - if (file_encoders.size() > 1 && !reel->contains(i)) { + if (file_encoders.size() > 1 && !reel->contains(time)) { /* Next reel and file */ ++reel; ++encoder; @@ -184,12 +189,12 @@ FFmpegEncoder::go () for (int j = 0; j < gets_per_frame; ++j) { Butler::Error e; - auto v = _butler->get_video (Butler::Behaviour::BLOCKING, &e); - _butler->rethrow (); - if (v.first) { - auto fe = encoder->get (v.first->eyes()); + auto video = _butler.get_video(Butler::Behaviour::BLOCKING, &e); + _butler.rethrow(); + if (video.first) { + auto fe = encoder->get(video.first->eyes()); if (fe) { - fe->video(v.first, v.second - reel->from); + fe->video(video.first, video.second - reel->from); } } else { if (e.code != Butler::Error::Code::FINISHED) { @@ -202,17 +207,17 @@ FFmpegEncoder::go () { boost::mutex::scoped_lock lm (_mutex); - _last_time = i; + _last_time = time; } auto job = _job.lock (); if (job) { - job->set_progress (float(i.get()) / _film->length().get()); + job->set_progress(float(time.get()) / _film->length().get()); } waker.nudge (); - _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames); + _butler.get_audio(Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames); /* XXX: inefficient; butler interleaves and we deinterleave again */ float* p = interleaved.data(); for (int j = 0; j < audio_frames; ++j) { @@ -255,14 +260,14 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( ) { if (three_d) { - /// TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export _encoders[Eyes::LEFT] = make_shared( video_frame_size, video_frame_rate, audio_frame_rate, channels, format, + // TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension) ); - /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export _encoders[Eyes::RIGHT] = make_shared( video_frame_size, video_frame_rate, audio_frame_rate, channels, format, + // TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension) ); } else {