Remove swaroop variant.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index cd03c7b93a1cf762b88add85347525b5bb0d9d40..1d8feffa8f4ed369ae177eabc85ce91d1511c9a3 100644 (file)
--- 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 (
@@ -54,13 +57,14 @@ FFmpegEncoder::FFmpegEncoder (
        bool split_reels,
        bool audio_stream_per_channel,
        int x264_crf
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , optional<dcp::Key> key
-       , optional<string> id
-#endif
        )
        : 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)
 {
        _player->set_always_burn_open_subtitles ();
        _player->set_play_referenced ();
@@ -102,12 +106,29 @@ FFmpegEncoder::FFmpegEncoder (
                }
        }
 
-       _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+       _butler.reset (
+               new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false)
+               );
+}
 
-       int const files = split_reels ? film->reels().size() : 1;
+
+void
+FFmpegEncoder::go ()
+{
+       {
+               shared_ptr<Job> job = _job.lock ();
+               DCPOMATIC_ASSERT (job);
+               job->sub (_("Encoding"));
+       }
+
+       Waker waker;
+
+       list<FileEncoderSet> file_encoders;
+
+       int const files = _split_reels ? _film->reels().size() : 1;
        for (int i = 0; i < files; ++i) {
 
-               boost::filesystem::path filename = output;
+               boost::filesystem::path filename = _output;
                string extension = boost::filesystem::extension (filename);
                filename = boost::filesystem::change_extension (filename, "");
 
@@ -117,42 +138,25 @@ FFmpegEncoder::FFmpegEncoder (
                        filename = filename.string() + String::compose(_("_reel%1"), i + 1);
                }
 
-               _file_encoders.push_back (
+               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,
+                               _format,
+                               _audio_stream_per_channel,
+                               _x264_crf,
                                _film->three_d(),
                                filename,
                                extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                               , key
-                               , id
-#endif
                                )
                        );
        }
-}
-
-
-void
-FFmpegEncoder::go ()
-{
-       {
-               shared_ptr<Job> job = _job.lock ();
-               DCPOMATIC_ASSERT (job);
-               job->sub (_("Encoding"));
-       }
-
-       Waker waker;
 
        list<DCPTimePeriod> reel_periods = _film->reels ();
        list<DCPTimePeriod>::const_iterator reel = reel_periods.begin ();
-       list<FileEncoderSet>::iterator encoder = _file_encoders.begin ();
+       list<FileEncoderSet>::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());
@@ -161,12 +165,12 @@ 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) {
@@ -174,7 +178,7 @@ FFmpegEncoder::go ()
                        pair<shared_ptr<PlayerVideo>, 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", e.summary()));
+                               throw DecodeError(String::compose("Error during decoding: %1", e.summary()));
                        }
                        shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
                        if (fe) {
@@ -208,7 +212,7 @@ FFmpegEncoder::go ()
        }
        delete[] interleaved;
 
-       BOOST_FOREACH (FileEncoderSet i, _file_encoders) {
+       BOOST_FOREACH (FileEncoderSet i, file_encoders) {
                i.flush ();
        }
 }
@@ -237,10 +241,6 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
        bool three_d,
        boost::filesystem::path output,
        string extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , optional<dcp::Key> key
-       , optional<string> id
-#endif
        )
 {
        if (three_d) {
@@ -248,31 +248,19 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
                _encoders[EYES_LEFT] = shared_ptr<FFmpegFileEncoder>(
                        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
-                               )
+                               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] = shared_ptr<FFmpegFileEncoder>(
                        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
-                               )
+                               audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension))
                        );
        } else {
                _encoders[EYES_BOTH]  = shared_ptr<FFmpegFileEncoder>(
                        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
-                               )
+                               audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension))
                        );
        }
 }