X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=61e489f071c112e6d092438430ba919e83654a2d;hb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;hp=bb696055c5761cdc2e9a5d2dc0c5a7cf81a1f45e;hpb=f41310384889e4cfb6e709d098b316e212d8bf22;p=dcpomatic.git diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index bb696055c..61e489f07 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -37,10 +37,14 @@ using std::runtime_error; using std::cout; using std::pair; using std::list; +using std::map; using boost::shared_ptr; using boost::bind; using boost::weak_ptr; +using boost::optional; +using namespace dcpomatic; +/** @param key Key to use to encrypt MP4 outputs */ FFmpegEncoder::FFmpegEncoder ( shared_ptr film, weak_ptr job, @@ -49,35 +53,42 @@ FFmpegEncoder::FFmpegEncoder ( bool mixdown_to_stereo, bool split_reels, int x264_crf +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional key + , optional id +#endif ) : Encoder (film, job) - , _history (1000) + , _history (200) { 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) { - string extension = boost::filesystem::extension (filename); - filename = boost::filesystem::change_extension (filename, ""); - /// TRANSLATORS: _reel%1.%2 here is to be added to an export filename to indicate - /// which reel it is. Preserve the %1 and %2; %1 will be replaced with the reel number - /// and %2 with the file extension. - filename = filename.string() + String::compose(_("_reel%1%2"), i + 1, extension); + /// 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 ( - shared_ptr( - new FFmpegFileEncoder( - _film->frame_size(), - _film->video_frame_rate(), - _film->audio_frame_rate(), - mixdown_to_stereo ? 2 : film->audio_channels(), - _film->log(), - format, - x264_crf, - filename - ) + 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 ) ); } @@ -107,7 +118,7 @@ FFmpegEncoder::FFmpegEncoder ( } } - _butler.reset (new Butler (_player, film->log(), map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false)); + _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false)); } void @@ -119,14 +130,17 @@ FFmpegEncoder::go () job->sub (_("Encoding")); } + Waker waker; + list reel_periods = _film->reels (); list::const_iterator reel = reel_periods.begin (); - list >::iterator encoder = _file_encoders.begin (); + list::iterator encoder = _file_encoders.begin (); DCPTime 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)); + 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)) { @@ -137,8 +151,17 @@ FFmpegEncoder::go () DCPOMATIC_ASSERT (encoder != _file_encoders.end()); } - pair, DCPTime> v = _butler->get_video (); - (*encoder)->video (v.first, v.second); + for (int j = 0; j < gets_per_frame; ++j) { + Butler::Error e; + pair, DCPTime> v = _butler->get_video (true, &e); + 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); + } + } _history.event (); @@ -152,6 +175,8 @@ FFmpegEncoder::go () 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; @@ -160,16 +185,16 @@ FFmpegEncoder::go () deinterleaved->data(k)[j] = *p++; } } - (*encoder)->audio (deinterleaved); + encoder->audio (deinterleaved); } delete[] interleaved; - BOOST_FOREACH (shared_ptr i, _file_encoders) { - i->flush (); + BOOST_FOREACH (FileEncoderSet i, _file_encoders) { + i.flush (); } } -float +optional FFmpegEncoder::current_rate () const { return _history.rate (); @@ -181,3 +206,82 @@ FFmpegEncoder::frames_done () const boost::mutex::scoped_lock lm (_mutex); return _last_time.frames_round (_film->video_frame_rate ()); } + +FFmpegEncoder::FileEncoderSet::FileEncoderSet ( + dcp::Size video_frame_size, + int video_frame_rate, + int audio_frame_rate, + int channels, + ExportFormat format, + 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 + ) + ); + /// 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 + ) + ); + } 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 + ) + ); + } +} + +shared_ptr +FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const +{ + 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(); + } + } + + map >::const_iterator i = _encoders.find (eyes); + DCPOMATIC_ASSERT (i != _encoders.end()); + return i->second; +} + +void +FFmpegEncoder::FileEncoderSet::flush () +{ + for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { + i->second->flush (); + } +} + +void +FFmpegEncoder::FileEncoderSet::audio (shared_ptr a) +{ + for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { + i->second->audio (a); + } +}