X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=8f9b3defc676af3f81494c2b7796649a1e53fe16;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hp=61e489f071c112e6d092438430ba919e83654a2d;hpb=4787f3a114115a16f7007c7b1bd36fb2e2121345;p=dcpomatic.git diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 61e489f07..8f9b3defc 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -43,6 +43,9 @@ 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,6 +55,7 @@ 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 @@ -60,39 +64,12 @@ FFmpegEncoder::FFmpegEncoder ( ) : 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) { - 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) { - /// 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 ( - 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 - ) - ); - } - _player->set_always_burn_open_subtitles (); _player->set_play_referenced (); @@ -104,15 +81,30 @@ FFmpegEncoder::FFmpegEncoder ( map = AudioMapping (ch, 2); float const overall_gain = 2 / (4 + sqrt(2)); float const minus_3dB = 1 / sqrt(2); - 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); + 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 { - _output_audio_channels = ch; - map = AudioMapping (ch, ch); + /* 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); } @@ -121,6 +113,7 @@ FFmpegEncoder::FFmpegEncoder ( _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false)); } + void FFmpegEncoder::go () { @@ -132,9 +125,44 @@ FFmpegEncoder::go () 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; + string extension = boost::filesystem::extension (filename); + filename = boost::filesystem::change_extension (filename, ""); + + if (files > 1) { + /// 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 ( + FileEncoderSet ( + _film->frame_size(), + _film->video_frame_rate(), + _film->audio_frame_rate(), + _output_audio_channels, + _format, + _audio_stream_per_channel, + _x264_crf, + _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 (); + 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()); @@ -143,19 +171,20 @@ FFmpegEncoder::go () 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); + _butler->rethrow (); if (!v.first) { - throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast(e))); + throw DecodeError(String::compose("Error during decoding: %1", e.summary())); } shared_ptr fe = encoder->get (v.first->eyes()); if (fe) { @@ -189,7 +218,7 @@ FFmpegEncoder::go () } delete[] interleaved; - BOOST_FOREACH (FileEncoderSet i, _file_encoders) { + BOOST_FOREACH (FileEncoderSet i, file_encoders) { i.flush (); } } @@ -213,6 +242,7 @@ 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, @@ -226,7 +256,9 @@ 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, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension) + 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 @@ -234,7 +266,9 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( ); /// 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) + 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 @@ -242,7 +276,9 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( ); } 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) + 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