X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=49908587bca88cdd17c257d967423409a972229d;hb=6dc179f7d08477ecc7bac1257b47dda048a1b878;hp=24ce22270554b19dcdac293acda4683b71853ae4;hpb=14f5424e2bd0f933965901f18b5b1673993e0045;p=dcpomatic.git diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 24ce22270..49908587b 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,6 +53,10 @@ 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) @@ -57,27 +65,30 @@ FFmpegEncoder::FFmpegEncoder ( 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)); + _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false)); } void @@ -121,23 +132,27 @@ FFmpegEncoder::go () 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 (!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()); } - pair, DCPTime> v = _butler->get_video (); - (*encoder)->video (v.first, v.second); + 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); + } _history.event (); @@ -159,16 +174,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 (); @@ -180,3 +195,71 @@ 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 +{ + 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); + } +}