X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=bcf2b82de898b5dd754f431b6533c4661ac3af71;hb=8987f133295e352c44e05ef338eacc801c61a629;hp=a3d2ff86f3446d2429bc2ccb979a8d57cbbd7635;hpb=2f796cd531de522a3b7ed03a9942f3c55f3a0b5b;p=dcpomatic.git diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index a3d2ff86f..bcf2b82de 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -18,31 +18,35 @@ */ + +#include "butler.h" +#include "cross.h" #include "ffmpeg_encoder.h" #include "film.h" +#include "image.h" #include "job.h" +#include "log.h" #include "player.h" #include "player_video.h" -#include "log.h" -#include "image.h" -#include "cross.h" -#include "butler.h" #include "compose.hpp" #include #include "i18n.h" -using std::string; -using std::runtime_error; + using std::cout; -using std::pair; using std::list; -using std::map; -using boost::shared_ptr; +using std::make_shared; +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,14 +56,16 @@ 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 (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 (); @@ -73,21 +79,21 @@ FFmpegEncoder::FFmpegEncoder ( 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); + map.set (dcp::Channel::LEFT, 0, 1); + map.set (dcp::Channel::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); + 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::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); + 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 { @@ -101,12 +107,38 @@ FFmpegEncoder::FFmpegEncoder ( } } - _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, FFmpegFileEncoder::pixel_format(format)), + VideoRange::VIDEO, + Image::Alignment::PADDED, + false, + false, + Butler::Audio::ENABLED + ); +} + + +void +FFmpegEncoder::go () +{ + { + auto job = _job.lock (); + DCPOMATIC_ASSERT (job); + job->sub (_("Encoding")); + } - int const files = split_reels ? film->reels().size() : 1; + 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; + boost::filesystem::path filename = _output; string extension = boost::filesystem::extension (filename); filename = boost::filesystem::change_extension (filename, ""); @@ -116,67 +148,54 @@ FFmpegEncoder::FFmpegEncoder ( filename = filename.string() + String::compose(_("_reel%1"), i + 1); } - _file_encoders.push_back ( + file_encoders.push_back ( FileEncoderSet ( _film->frame_size(), _film->video_frame_rate(), _film->audio_frame_rate(), _output_audio_channels, - format, - x264_crf, + _format, + _audio_stream_per_channel, + _x264_crf, _film->three_d(), filename, extension -#ifdef DCPOMATIC_VARIANT_SWAROOP - , key - , id -#endif ) ); } -} - - -void -FFmpegEncoder::go () -{ - { - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - job->sub (_("Encoding")); - } - - Waker waker; - list reel_periods = _film->reels (); - list::const_iterator reel = reel_periods.begin (); - list::iterator encoder = _file_encoders.begin (); + 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)); + 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) { - 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) { Butler::Error e; - pair, DCPTime> v = _butler->get_video (true, &e); + auto v = _butler->get_video (Butler::Behaviour::BLOCKING, &e); _butler->rethrow (); - if (!v.first) { - throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast(e))); - } - shared_ptr fe = encoder->get (v.first->eyes()); - if (fe) { - fe->video(v.first, v.second); + if (v.first) { + auto fe = encoder->get (v.first->eyes()); + if (fe) { + fe->video(v.first, v.second - reel->from); + } + } else { + if (e.code != Butler::Error::Code::FINISHED) { + throw DecodeError(String::compose("Error during decoding: %1", e.summary())); + } } } @@ -187,16 +206,16 @@ 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); + _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames); /* XXX: inefficient; butler interleaves and we deinterleave again */ - float* p = interleaved; + float* p = interleaved.data(); for (int j = 0; j < audio_frames; ++j) { for (int k = 0; k < _output_audio_channels; ++k) { deinterleaved->data(k)[j] = *p++; @@ -204,9 +223,8 @@ FFmpegEncoder::go () } encoder->audio (deinterleaved); } - delete[] interleaved; - BOOST_FOREACH (FileEncoderSet i, _file_encoders) { + for (auto i: file_encoders) { i.flush (); } } @@ -230,40 +248,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) ); } } @@ -273,16 +279,16 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const { if (_encoders.size() == 1) { /* We are doing a 2D export... */ - if (eyes == EYES_LEFT) { + 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) { + eyes = Eyes::BOTH; + } else if (eyes == Eyes::RIGHT) { /* ...and ignore the right eye.*/ - return shared_ptr(); + return {}; } } - map >::const_iterator i = _encoders.find (eyes); + auto i = _encoders.find (eyes); DCPOMATIC_ASSERT (i != _encoders.end()); return i->second; } @@ -290,15 +296,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); } }