X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=81ea3a9dd89f56b0c1fff44cbe9241b3c57f2427;hp=9504b51b867651369480f81273de7d0a9a6b1930;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=28111007e2e6fd62f5810be780706ae1618bd33f diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 9504b51b8..81ea3a9dd 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -18,35 +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 std::make_shared; using std::shared_ptr; -using boost::bind; +using std::string; using std::weak_ptr; +using boost::bind; 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, @@ -106,8 +107,8 @@ FFmpegEncoder::FFmpegEncoder ( } } - _butler.reset ( - new Butler(_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false) + _butler = std::make_shared( + _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false ); } @@ -116,7 +117,7 @@ void FFmpegEncoder::go () { { - shared_ptr job = _job.lock (); + auto job = _job.lock (); DCPOMATIC_ASSERT (job); job->sub (_("Encoding")); } @@ -154,14 +155,14 @@ FFmpegEncoder::go () ); } - 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)); + 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) { @@ -175,14 +176,17 @@ FFmpegEncoder::go () 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 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); + 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())); + } } } @@ -193,14 +197,14 @@ 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, audio_frames); /* XXX: inefficient; butler interleaves and we deinterleave again */ float* p = interleaved; for (int j = 0; j < audio_frames; ++j) { @@ -245,22 +249,19 @@ 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] = 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)) + _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, - audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)) + _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, - audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension)) + _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) ); } } @@ -270,16 +271,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; } @@ -287,15 +288,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); } }