Use a plain declaration rather than a shared_ptr.

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 6b31c4201901bf5004b7a1efc9a848615799c5fd..2fcad68fe3c6fa14494f120177b479fc76e36dac 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -59,65 +59,71 @@ FFmpegEncoder::FFmpegEncoder (
        int x264_crf
        )
        : Encoder (film, job)
+       , _output_audio_channels(mixdown_to_stereo ? 2 : (_film->audio_channels() > 8 ? 16 : _film->audio_channels()))
        , _history (200)
        , _output (output)
        , _format (format)
        , _split_reels (split_reels)
        , _audio_stream_per_channel (audio_stream_per_channel)
        , _x264_crf (x264_crf)
-{
-       _player->set_always_burn_open_subtitles ();
-       _player->set_play_referenced ();
-
-       int const ch = film->audio_channels ();
-
-       AudioMapping map;
-       if (mixdown_to_stereo) {
-               _output_audio_channels = 2;
-               map = AudioMapping (ch, 2);
-               float const overall_gain = 2 / (4 + sqrt(2));
-               float const minus_3dB = 1 / sqrt(2);
-               if (ch == 2) {
-                       map.set (dcp::Channel::LEFT, 0, 1);
-                       map.set (dcp::Channel::RIGHT, 1, 1);
-               } else if (ch == 4) {
-                       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);
-                       map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
-                       map.set (dcp::Channel::LS,     0, overall_gain);
-               } else if (ch >= 6) {
-                       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);
-                       map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
-                       map.set (dcp::Channel::LS,     0, overall_gain);
-                       map.set (dcp::Channel::RS,     1, overall_gain);
-               }
-               /* XXX: maybe we should do something better for >6 channel DCPs */
-       } else {
-               /* 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);
-               }
-       }
-
-       _butler = std::make_shared<Butler>(
+       , _butler(
                _film,
                _player,
-               map,
+               mixdown_to_stereo ? stereo_map() : many_channel_map(),
                _output_audio_channels,
-               bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)),
+               boost::bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)),
                VideoRange::VIDEO,
                Image::Alignment::PADDED,
                false,
                false,
                Butler::Audio::ENABLED
-               );
+               )
+{
+       _player->set_always_burn_open_subtitles ();
+       _player->set_play_referenced ();
+}
+
+
+AudioMapping
+FFmpegEncoder::stereo_map() const
+{
+       auto map = AudioMapping(_film->audio_channels(), 2);
+       float const overall_gain = 2 / (4 + sqrt(2));
+       float const minus_3dB = 1 / sqrt(2);
+       switch (_film->audio_channels()) {
+       case 2:
+               map.set(dcp::Channel::LEFT, 0, 1);
+               map.set(dcp::Channel::RIGHT, 1, 1);
+               break;
+       case 4:
+               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);
+               map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
+               map.set(dcp::Channel::LS,     0, overall_gain);
+               break;
+       case 6:
+               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);
+               map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
+               map.set(dcp::Channel::LS,     0, overall_gain);
+               map.set(dcp::Channel::RS,     1, overall_gain);
+               break;
+       }
+       /* XXX: maybe we should do something better for >6 channel DCPs */
+       return map;
+}
+
+
+AudioMapping
+FFmpegEncoder::many_channel_map() const
+{
+       auto map = AudioMapping(_film->audio_channels(), _output_audio_channels);
+       for (int i = 0; i < _film->audio_channels(); ++i) {
+               map.set(i, i, 1);
+       }
+       return map;
 }
 
 
@@ -184,8 +190,8 @@ FFmpegEncoder::go ()
 
                for (int j = 0; j < gets_per_frame; ++j) {
                        Butler::Error e;
-                       auto v = _butler->get_video (Butler::Behaviour::BLOCKING, &e);
-                       _butler->rethrow ();
+                       auto v = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
+                       _butler.rethrow();
                        if (v.first) {
                                auto fe = encoder->get (v.first->eyes());
                                if (fe) {
@@ -212,7 +218,7 @@ FFmpegEncoder::go ()
 
                waker.nudge ();
 
-               _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames);
+               _butler.get_audio(Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames);
                /* XXX: inefficient; butler interleaves and we deinterleave again */
                float* p = interleaved.data();
                for (int j = 0; j < audio_frames; ++j) {

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 393a6d72eaa58bd1d09670015315a43a18097824..2d5c6af8703cfd3f8331f40f4a6f7989df40ed21 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -21,12 +21,12 @@
 #ifndef DCPOMATIC_FFMPEG_ENCODER_H
 #define DCPOMATIC_FFMPEG_ENCODER_H
 
+#include "audio_mapping.h"
+#include "butler.h"
 #include "encoder.h"
 #include "event_history.h"
-#include "audio_mapping.h"
 #include "ffmpeg_file_encoder.h"
 
-class Butler;
 
 class FFmpegEncoder : public Encoder
 {
@@ -76,6 +76,9 @@ private:
                std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
        };
 
+       AudioMapping stereo_map() const;
+       AudioMapping many_channel_map() const;
+
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
@@ -89,7 +92,7 @@ private:
        bool _audio_stream_per_channel;
        int _x264_crf;
 
-       std::shared_ptr<Butler> _butler;
+       Butler _butler;
 };
 
 #endif