Emit no audio from DCPs if none is mapped

[dcpomatic.git] / src / lib / ffmpeg_encoder.cc

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 001645af3c59e21ac7fdfaf89e55f205812a1763..c1170f098ce8b416cacd1ab1562e4d99cd4a1fd7 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -102,7 +102,7 @@ FFmpegEncoder::stereo_map() const
                map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
                map.set(dcp::Channel::LS,     0, overall_gain);
                break;
-       case 6:
+       default:
                map.set(dcp::Channel::LEFT,   0, overall_gain);
                map.set(dcp::Channel::RIGHT,  1, overall_gain);
                map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
@@ -111,7 +111,6 @@ FFmpegEncoder::stereo_map() const
                map.set(dcp::Channel::RS,     1, overall_gain);
                break;
        }
-       /* XXX: maybe we should do something better for >6 channel DCPs */
        return map;
 }
 
@@ -144,8 +143,8 @@ FFmpegEncoder::go ()
        for (int i = 0; i < files; ++i) {
 
                boost::filesystem::path filename = _output;
-               string extension = boost::filesystem::extension (filename);
-               filename = boost::filesystem::change_extension (filename, "");
+               auto extension = dcp::filesystem::extension(filename);
+               filename = dcp::filesystem::change_extension(filename, "");
 
                if (files > 1) {
                        /// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
@@ -178,9 +177,9 @@ FFmpegEncoder::go ()
        std::vector<float> interleaved(_output_audio_channels * audio_frames);
        auto deinterleaved = make_shared<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) {
+       for (DCPTime time; time < _film->length(); time += video_frame) {
 
-               if (file_encoders.size() > 1 && !reel->contains(i)) {
+               if (file_encoders.size() > 1 && !reel->contains(time)) {
                        /* Next reel and file */
                        ++reel;
                        ++encoder;
@@ -190,12 +189,12 @@ FFmpegEncoder::go ()
 
                for (int j = 0; j < gets_per_frame; ++j) {
                        Butler::Error e;
-                       auto v = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
+                       auto video = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
                        _butler.rethrow();
-                       if (v.first) {
-                               auto fe = encoder->get (v.first->eyes());
+                       if (video.first) {
+                               auto fe = encoder->get(video.first->eyes());
                                if (fe) {
-                                       fe->video(v.first, v.second - reel->from);
+                                       fe->video(video.first, video.second - reel->from);
                                }
                        } else {
                                if (e.code != Butler::Error::Code::FINISHED) {
@@ -208,12 +207,12 @@ FFmpegEncoder::go ()
 
                {
                        boost::mutex::scoped_lock lm (_mutex);
-                       _last_time = i;
+                       _last_time = time;
                }
 
                auto job = _job.lock ();
                if (job) {
-                       job->set_progress (float(i.get()) / _film->length().get());
+                       job->set_progress(float(time.get()) / _film->length().get());
                }
 
                waker.nudge ();
@@ -261,14 +260,14 @@ 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] = make_shared<FFmpegFileEncoder>(
                        video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
+                       // TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
                        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] = make_shared<FFmpegFileEncoder>(
                        video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
+                       // TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
                        audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)
                        );
        } else {