From 525d5c76b24119125572805ef041b1b226233069 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 27 Jul 2020 22:28:51 +0000 Subject: [PATCH] Trying to create export audio encoders with between 9 and 15 channels inclusive fails, at least for AAC. There's probably a way around this with some FFmpeg-cleverness but for now let's just export any project with more than 8 channels as 16. You could argue that we should offer choices to, for example export 7.1/HI/VN as 7.1 but that sounds fiddly. Fixes #1786. --- src/lib/ffmpeg_encoder.cc | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index afba7c187..25ad4a54c 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -54,34 +54,6 @@ FFmpegEncoder::FFmpegEncoder ( : Encoder (film, job) , _history (1000) { - 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 - ) - ); - } - _player->set_always_burn_open_subtitles (); _player->set_play_referenced (); @@ -111,14 +83,42 @@ FFmpegEncoder::FFmpegEncoder ( map.set (dcp::RS, 1, overall_gain); } } else { - _output_audio_channels = ch; - map = AudioMapping (ch, ch); + _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); } } _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false)); + + 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, + x264_crf, + _film->three_d(), + filename, + extension + ) + ); + } } void -- 2.30.2