X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=1ce375594b531229ead3ee6dbd0f68cdec1f0577;hp=572e7ae16080ef7b8bc2a44bf781a0defe2299d7;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=335ef709439cd3678f6813a3fb880110e4c9cb26 diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 572e7ae16..1ce375594 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -32,17 +32,21 @@ #include "i18n.h" -using std::string; -using std::runtime_error; using std::cout; -using std::pair; using std::list; +using std::make_shared; using std::map; -using boost::shared_ptr; +using std::pair; +using std::runtime_error; +using std::shared_ptr; +using std::string; +using std::weak_ptr; using boost::bind; -using boost::weak_ptr; using boost::optional; using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif /** @param key Key to use to encrypt MP4 outputs */ FFmpegEncoder::FFmpegEncoder ( @@ -52,47 +56,17 @@ FFmpegEncoder::FFmpegEncoder ( ExportFormat format, bool mixdown_to_stereo, bool split_reels, + bool audio_stream_per_channel, int x264_crf -#ifdef DCPOMATIC_VARIANT_SWAROOP - , optional key - , optional id -#endif ) : Encoder (film, job) - , _history (1000) + , _history (200) + , _output (output) + , _format (format) + , _split_reels (split_reels) + , _audio_stream_per_channel (audio_stream_per_channel) + , _x264_crf (x264_crf) { - int const files = split_reels ? film->reels().size() : 1; - for (int i = 0; i < files; ++i) { - - boost::filesystem::path filename = output; - string extension = boost::filesystem::extension (filename); - filename = boost::filesystem::change_extension (filename, ""); - - if (files > 1) { - /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate - /// which reel it is. Preserve the %1; it will be replaced with the reel number. - filename = filename.string() + String::compose(_("_reel%1"), i + 1); - } - - _file_encoders.push_back ( - FileEncoderSet ( - _film->frame_size(), - _film->video_frame_rate(), - _film->audio_frame_rate(), - mixdown_to_stereo ? 2 : film->audio_channels(), - format, - x264_crf, - _film->three_d(), - filename, - extension -#ifdef DCPOMATIC_VARIANT_SWAROOP - , key - , id -#endif - ) - ); - } - _player->set_always_burn_open_subtitles (); _player->set_play_referenced (); @@ -104,54 +78,113 @@ FFmpegEncoder::FFmpegEncoder ( 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); + 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 { - _output_audio_channels = ch; - map = AudioMapping (ch, ch); + /* 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)); + _butler = std::make_shared( + _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, true, false + ); } + void FFmpegEncoder::go () { { - shared_ptr job = _job.lock (); + auto job = _job.lock (); DCPOMATIC_ASSERT (job); job->sub (_("Encoding")); } - list reel_periods = _film->reels (); - list::const_iterator reel = reel_periods.begin (); - list::iterator encoder = _file_encoders.begin (); + Waker waker; + + list file_encoders; + + int const files = _split_reels ? _film->reels().size() : 1; + for (int i = 0; i < files; ++i) { + + boost::filesystem::path filename = _output; + string extension = boost::filesystem::extension (filename); + filename = boost::filesystem::change_extension (filename, ""); + + if (files > 1) { + /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate + /// which reel it is. Preserve the %1; it will be replaced with the reel number. + filename = filename.string() + String::compose(_("_reel%1"), i + 1); + } + + file_encoders.push_back ( + FileEncoderSet ( + _film->frame_size(), + _film->video_frame_rate(), + _film->audio_frame_rate(), + _output_audio_channels, + _format, + _audio_stream_per_channel, + _x264_crf, + _film->three_d(), + filename, + extension + ) + ); + } + + auto reel_periods = _film->reels (); + auto reel = reel_periods.begin (); + auto encoder = file_encoders.begin (); - DCPTime const video_frame = DCPTime::from_frames (1, _film->video_frame_rate ()); + auto const video_frame = DCPTime::from_frames (1, _film->video_frame_rate ()); int const audio_frames = video_frame.frames_round(_film->audio_frame_rate()); float* interleaved = new float[_output_audio_channels * audio_frames]; - shared_ptr deinterleaved (new AudioBuffers (_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) { - if (_file_encoders.size() > 1 && !reel->contains(i)) { + if (file_encoders.size() > 1 && !reel->contains(i)) { /* Next reel and file */ ++reel; ++encoder; DCPOMATIC_ASSERT (reel != reel_periods.end()); - DCPOMATIC_ASSERT (encoder != _file_encoders.end()); + DCPOMATIC_ASSERT (encoder != file_encoders.end()); } for (int j = 0; j < gets_per_frame; ++j) { - pair, DCPTime> v = _butler->get_video (true, 0); - encoder->get(v.first->eyes())->video(v.first, v.second); + Butler::Error e; + auto v = _butler->get_video (true, &e); + _butler->rethrow (); + if (!v.first) { + throw DecodeError(String::compose("Error during decoding: %1", e.summary())); + } + auto fe = encoder->get (v.first->eyes()); + if (fe) { + fe->video(v.first, v.second - reel->from); + } } _history.event (); @@ -161,11 +194,13 @@ FFmpegEncoder::go () _last_time = i; } - shared_ptr job = _job.lock (); + auto job = _job.lock (); if (job) { 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; @@ -178,12 +213,12 @@ FFmpegEncoder::go () } delete[] interleaved; - BOOST_FOREACH (FileEncoderSet i, _file_encoders) { + for (auto i: file_encoders) { i.flush (); } } -float +optional FFmpegEncoder::current_rate () const { return _history.rate (); @@ -202,40 +237,28 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( int audio_frame_rate, int channels, ExportFormat format, + bool audio_stream_per_channel, int x264_crf, bool three_d, boost::filesystem::path output, string extension -#ifdef DCPOMATIC_VARIANT_SWAROOP - , optional key - , optional 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( - 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 - ) + _encoders[Eyes::LEFT] = make_shared( + 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) ); /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export - _encoders[EYES_RIGHT] = shared_ptr( - 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 - ) + _encoders[Eyes::RIGHT] = make_shared( + 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) ); } else { - _encoders[EYES_BOTH] = shared_ptr( - 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 - ) + _encoders[Eyes::BOTH] = make_shared( + video_frame_size, video_frame_rate, audio_frame_rate, channels, format, + audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension) ); } } @@ -243,7 +266,18 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( shared_ptr FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const { - map >::const_iterator i = _encoders.find (eyes); + 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(); + } + } + + auto i = _encoders.find (eyes); DCPOMATIC_ASSERT (i != _encoders.end()); return i->second; } @@ -251,15 +285,15 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const void FFmpegEncoder::FileEncoderSet::flush () { - for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { - i->second->flush (); + for (auto& i: _encoders) { + i.second->flush (); } } void FFmpegEncoder::FileEncoderSet::audio (shared_ptr a) { - for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { - i->second->audio (a); + for (auto& i: _encoders) { + i.second->audio (a); } }