X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=60241b23319f3816b265a5b3beacebb07d4ee62b;hb=HEAD;hp=2c76a38c3973405d2733f3046361eb008bb93bf9;hpb=b057363e69b77119137c0c8b07402828096e03aa;p=dcpomatic.git diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 2c76a38c3..c1170f098 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -18,36 +18,36 @@ */ + +#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 ( shared_ptr film, weak_ptr job, @@ -57,62 +57,72 @@ FFmpegEncoder::FFmpegEncoder ( bool split_reels, bool audio_stream_per_channel, int x264_crf -#ifdef DCPOMATIC_VARIANT_SWAROOP - , optional key - , optional id -#endif ) : 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) + , _butler( + _film, + _player, + mixdown_to_stereo ? stereo_map() : many_channel_map(), + _output_audio_channels, + 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 (); - - 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); - } + _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; +} - _butler.reset ( - new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false) - ); + +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; } @@ -120,7 +130,7 @@ void FFmpegEncoder::go () { { - shared_ptr job = _job.lock (); + auto job = _job.lock (); DCPOMATIC_ASSERT (job); job->sub (_("Encoding")); } @@ -133,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 @@ -154,26 +164,22 @@ FFmpegEncoder::go () _film->three_d(), filename, extension -#ifdef DCPOMATIC_VARIANT_SWAROOP - , key - , id -#endif ) ); } - 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) { + 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; @@ -183,14 +189,17 @@ FFmpegEncoder::go () for (int j = 0; j < gets_per_frame; ++j) { Butler::Error e; - pair, DCPTime> v = _butler->get_video (true, &e); - _butler->rethrow (); - if (!v.first) { - throw DecodeError(String::compose("Error during decoding: %1", e.summary())); - } - shared_ptr fe = encoder->get (v.first->eyes()); - if (fe) { - fe->video(v.first, v.second); + 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(video.first, video.second - reel->from); + } + } else { + if (e.code != Butler::Error::Code::FINISHED) { + throw DecodeError(String::compose("Error during decoding: %1", e.summary())); + } } } @@ -198,19 +207,19 @@ FFmpegEncoder::go () { boost::mutex::scoped_lock lm (_mutex); - _last_time = i; + _last_time = time; } - shared_ptr job = _job.lock (); + 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 (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++; @@ -218,9 +227,8 @@ FFmpegEncoder::go () } encoder->audio (deinterleaved); } - delete[] interleaved; - BOOST_FOREACH (FileEncoderSet i, file_encoders) { + for (auto i: file_encoders) { i.flush (); } } @@ -249,42 +257,23 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( 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, - audio_stream_per_channel, 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, + // 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] = shared_ptr( - 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 - ) + _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 { - _encoders[EYES_BOTH] = shared_ptr( - 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 - ) + _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) ); } } @@ -294,16 +283,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; } @@ -311,15 +300,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); } }