Basic and untested export option to bounce down to stereo; add encoder test with...

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 52df6c299496c3e316ca6f1b661d229260ad354c..5d06616ee79e9122a14efc8e76ad9bc4c6de34dd 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -47,12 +47,11 @@ force_pixel_format (AVPixelFormat, AVPixelFormat out)
        return out;
 }
 
-FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, boost::filesystem::path output, Format format)
+FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo)
        : Encoder (film, job)
        , _video_options (0)
        , _history (1000)
        , _output (output)
-       , _pending_audio (new AudioBuffers (film->audio_channels(), 0))
 {
        switch (format) {
        case FORMAT_PRORES:
@@ -73,6 +72,27 @@ FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, bo
 
        _player->set_always_burn_subtitles (true);
        _player->set_play_referenced ();
+
+       int const ch = film->audio_channels ();
+
+       if (mixdown_to_stereo) {
+               _audio_mapping = AudioMapping (ch, 2);
+               float const overall_gain = 2 / (4 + sqrt(2));
+               float const minus_3dB = 1 / sqrt(2);
+               _audio_mapping.set (dcp::LEFT,   0, overall_gain);
+               _audio_mapping.set (dcp::RIGHT,  1, overall_gain);
+               _audio_mapping.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+               _audio_mapping.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+               _audio_mapping.set (dcp::LS,     0, overall_gain);
+               _audio_mapping.set (dcp::RS,     0, overall_gain);
+               _pending_audio.reset (new AudioBuffers (2, 0));
+       } else {
+               _audio_mapping = AudioMapping (ch, ch);
+               _pending_audio.reset (new AudioBuffers (ch, 0));
+               for (int i = 0; i < ch; ++i) {
+                       _audio_mapping.set (i, i, 1);
+               }
+       }
 }
 
 void
@@ -118,8 +138,8 @@ FFmpegEncoder::setup_audio ()
        _audio_codec_context->bit_rate = 256 * 1024;
        _audio_codec_context->sample_fmt = _sample_format;
        _audio_codec_context->sample_rate = _film->audio_frame_rate ();
-       _audio_codec_context->channel_layout = av_get_default_channel_layout (_film->audio_channels ());
-       _audio_codec_context->channels = _film->audio_channels ();
+       _audio_codec_context->channel_layout = av_get_default_channel_layout (_audio_mapping.output_channels ());
+       _audio_codec_context->channels = _audio_mapping.output_channels ();
 }
 
 void
@@ -288,7 +308,7 @@ FFmpegEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 void
 FFmpegEncoder::audio (shared_ptr<AudioBuffers> audio, DCPTime)
 {
-       _pending_audio->append (audio);
+       _pending_audio->append (remap (audio, _audio_mapping.output_channels(), _audio_mapping));
 
        int frame_size = _audio_codec_context->frame_size;
        if (frame_size == 0) {
@@ -309,7 +329,7 @@ FFmpegEncoder::audio_frame (int size)
        AVFrame* frame = av_frame_alloc ();
        DCPOMATIC_ASSERT (frame);
 
-       int const channels = _audio_codec_context->channels;
+       int const channels = _pending_audio->channels();
        DCPOMATIC_ASSERT (channels);
 
        int const buffer_size = av_samples_get_buffer_size (0, channels, size, _audio_codec_context->sample_fmt, 0);

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index c7929c54fb6fd5670eee806fef63c174cffa3257..5ab59c12dcdcfe640ae5bc5902bc7be58a43d348 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -23,6 +23,7 @@
 
 #include "encoder.h"
 #include "event_history.h"
+#include "audio_mapping.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -37,7 +38,7 @@ public:
                FORMAT_H264
        };
 
-       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format);
+       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo);
 
        void go ();
 
@@ -69,6 +70,7 @@ private:
        AVDictionary* _video_options;
        std::string _video_codec_name;
        std::string _audio_codec_name;
+       AudioMapping _audio_mapping;
 
        mutable boost::mutex _mutex;
        DCPTime _last_time;

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index b5f317942749a2089a2ab94bc87cf697263fb8c0..041644d91b21e6b851336dbdaec57a812a6e8110 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -708,7 +708,7 @@ private:
                ExportDialog* d = new ExportDialog (this);
                if (d->ShowModal() == wxID_OK) {
                        shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
-                       job->set_encoder (shared_ptr<FFmpegEncoder> (new FFmpegEncoder (_film, job, d->path(), d->format())));
+                       job->set_encoder (shared_ptr<FFmpegEncoder> (new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo())));
                        JobManager::instance()->add (job);
                }
                d->Destroy ();

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 52aa03c20028841d0d08f3936fc1b834f21ca80b..712ef4a7e9a96cf7b281574da48ccfdbb0f0b1a4 100644 (file)
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -48,6 +48,9 @@ ExportDialog::ExportDialog (wxWindow* parent)
        add (_("Format"), true);
        _format = new wxChoice (this, wxID_ANY);
        add (_format);
+       add_spacer ();
+       _mixdown = new wxCheckBox (this, wxID_ANY, _("Mix audio down to stereo"));
+       add (_mixdown, false);
        add (_("Output file"), true);
        _file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
        add (_file);
@@ -82,3 +85,9 @@ ExportDialog::format () const
        DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
        return formats[_format->GetSelection()];
 }
+
+bool
+ExportDialog::mixdown_to_stereo () const
+{
+       return _mixdown->GetValue ();
+}

diff --git a/src/wx/export_dialog.h b/src/wx/export_dialog.h
index 239e5682955caa4de2ab6c84380ee5f78588947b..0406c562f1aac5c1c246b911b80e210154f0c44c 100644 (file)
--- a/src/wx/export_dialog.h
+++ b/src/wx/export_dialog.h
@@ -32,10 +32,12 @@ public:
 
        boost::filesystem::path path () const;
        FFmpegEncoder::Format format () const;
+       bool mixdown_to_stereo () const;
 
 private:
        void format_changed ();
 
        wxChoice* _format;
+       wxCheckBox* _mixdown;
        FilePickerCtrl* _file;
 };

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 6c55a415ffd870d3c2f4517af2345e94fc10d283..d7f6ee89c971c2adfe814e9a5a863c8314d0389a 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -21,6 +21,7 @@
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/transcode_job.h"
 #include "test.h"
@@ -30,32 +31,52 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mov)
 {
-       shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test");
+       shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_mov");
        film->set_name ("ffmpeg_transcoder_basic_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
 
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
        shared_ptr<Job> job (new TranscodeJob (film));
-       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test.mov", FFmpegEncoder::FORMAT_PRORES);
+       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test.mov", FFmpegEncoder::FORMAT_PRORES, true);
        encoder.go ();
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mp4)
 {
-       shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test");
+       shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_mp4");
        film->set_name ("ffmpeg_transcoder_basic_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
 
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
        shared_ptr<Job> job (new TranscodeJob (film));
-       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test.mp4", FFmpegEncoder::FORMAT_H264);
+       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test.mp4", FFmpegEncoder::FORMAT_H264, false);
+       encoder.go ();
+}
+
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_subs)
+{
+       shared_ptr<Film> film = new_test_film ("ffmpeg_transcoder_basic_test_subs");
+       film->set_name ("ffmpeg_transcoder_basic_test");
+       film->set_container (Ratio::from_id ("185"));
+       film->set_audio_channels (6);
+
+       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+       film->examine_and_add_content (c);
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
+       film->examine_and_add_content (s);
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       shared_ptr<Job> job (new TranscodeJob (film));
+       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test_subs.mp4", FFmpegEncoder::FORMAT_H264, true);
        encoder.go ();
 }