Pass tolerant flag into Player.

This is needed because the DCPDecoder ends up needing it when it reads
reel information from CPLs.

Maybe all that stuff should be in our metadata.

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index a6ce5dcc80d8d615e3ea0b69f409899becda74dd..a9a7dfabdc71d71fe07f34777472f95b1f254e92 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -87,7 +87,7 @@ AnalyseAudioJob::run ()
 {
        LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::run");
 
-       auto player = make_shared<Player>(_film, _playlist);
+       auto player = make_shared<Player>(_film, _playlist, false);
        player->set_ignore_video ();
        player->set_ignore_text ();
        player->set_fast ();

diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc
index b2346d4d92012ae98f8dd4f2ac73e3964a7d3a95..66db25f0485e67ef7a0f0be97a13705bd31429b8 100644 (file)
--- a/src/lib/analyse_subtitles_job.cc
+++ b/src/lib/analyse_subtitles_job.cc
@@ -78,7 +78,7 @@ AnalyseSubtitlesJob::run ()
        DCPOMATIC_ASSERT (content);
        playlist->add (_film, content);
 
-       auto player = make_shared<Player>(_film, playlist);
+       auto player = make_shared<Player>(_film, playlist, false);
        player->set_ignore_audio ();
        player->set_fast ();
        player->set_play_referenced ();

diff --git a/src/lib/film_encoder.cc b/src/lib/film_encoder.cc
index 05b911daf0ea668283c70b63056be9ce94129218..33f7ea3cd30f92629eb735db265e7d23d55708fc 100644 (file)
--- a/src/lib/film_encoder.cc
+++ b/src/lib/film_encoder.cc
@@ -41,7 +41,7 @@
 FilmEncoder::FilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job)
        : _film (film)
        , _job (job)
-       , _player(film, Image::Alignment::PADDED)
+       , _player(film, Image::Alignment::PADDED, false)
 {
 
 }

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 1ad4a48343c8be4ce737f52db97302636f87a526..730a167d2914bc020164193ef8f8fe72b3ca7610 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -418,7 +418,7 @@ Hints::scan_content(shared_ptr<const Film> film)
                emit(boost::bind(boost::ref(Progress), _("Examining audio, subtitles and closed captions")));
        }
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        player->set_ignore_video();
        if (check_loudness_done || _disable_audio_analysis) {
                /* We don't need to analyse audio because we already loaded a suitable analysis */

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 1f44c961cf9c121d7ca222fd2e11766a06f272a7..7048435b554a9296b74ebb5954e13b0fcd526b31 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -97,7 +97,7 @@ int const PlayerProperty::ALWAYS_BURN_OPEN_SUBTITLES = 709;
 int const PlayerProperty::PLAY_REFERENCED = 710;
 
 
-Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment)
+Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment, bool tolerant)
        : _film (film)
        , _suspended (0)
        , _ignore_video(false)
@@ -105,7 +105,7 @@ Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment
        , _ignore_text(false)
        , _always_burn_open_subtitles(false)
        , _fast(false)
-       , _tolerant (film->tolerant())
+       , _tolerant(tolerant)
        , _play_referenced(false)
        , _audio_merger(film->audio_frame_rate())
        , _subtitle_alignment (subtitle_alignment)
@@ -114,7 +114,7 @@ Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment
 }
 
 
-Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_)
+Player::Player(shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_, bool tolerant)
        : _film (film)
        , _playlist (playlist_)
        , _suspended (0)
@@ -123,7 +123,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
        , _ignore_text(false)
        , _always_burn_open_subtitles(false)
        , _fast(false)
-       , _tolerant (film->tolerant())
+       , _tolerant(tolerant)
        , _play_referenced(false)
        , _audio_merger(film->audio_frame_rate())
 {

diff --git a/src/lib/player.h b/src/lib/player.h
index eba206c9bc1eafe55b2e5269aba7c20395f34ddd..2faffe971f89ac602a302126f596f9d432e657fe 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -79,8 +79,8 @@ public:
 class Player
 {
 public:
-       Player (std::shared_ptr<const Film>, Image::Alignment subtitle_alignment);
-       Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist);
+       Player(std::shared_ptr<const Film>, Image::Alignment subtitle_alignment, bool tolerant);
+       Player(std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist, bool tolerant);
 
        Player (Player const&) = delete;
        Player& operator= (Player const&) = delete;

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 0ae5acf26292c72d407287207c6a3a85f2f06989..30318175b6938e6b4d14dba357766d78e905969d 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -790,7 +790,7 @@ private:
 
                auto path = boost::filesystem::path (wx_to_std(dialog.GetPath()));
 
-               auto player = make_shared<Player>(_film, Image::Alignment::PADDED);
+               auto player = make_shared<Player>(_film, Image::Alignment::PADDED, true);
                player->seek(_viewer.position(), true);
 
                bool done = false;

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index ff3295599da1ca4e905cd922cbfd4b18d49d1dcc..e7c14ab56f904ddbeaa416db9cdfe6672d141836 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -155,7 +155,7 @@ main (int argc, char* argv[])
                film = make_shared<Film>(film_dir);
                film->read_metadata ();
 
-               auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+               auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
                player->Video.connect (bind(&process_video, _1));
                while (!player->pass ()) {}
        } catch (std::exception& e) {

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9edd4578e4a17d9577dad428d1bfdd6e23f0a249..a7a2ab98449473e49e5983b5ebc9d1d6f5c664fd 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -171,7 +171,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
        }
 
        try {
-               _player.emplace(_film, _optimisation == Optimisation::NONE ? Image::Alignment::PADDED : Image::Alignment::COMPACT);
+               _player.emplace(_film, _optimisation == Optimisation::NONE ? Image::Alignment::PADDED : Image::Alignment::COMPACT, true);
                _player->set_fast ();
                if (_dcp_decode_reduction) {
                        _player->set_dcp_decode_reduction (_dcp_decode_reduction);

diff --git a/test/2536_regression_test.cc b/test/2536_regression_test.cc
index 9f74ffd094401d29c6c3356cf3523b4a2ff26e1c..955487724cac2a277d628766d165671dd1a9c8fe 100644 (file)
--- a/test/2536_regression_test.cc
+++ b/test/2536_regression_test.cc
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(crash_rendering_vf_interop_subs_test)
        auto test = new_test_film(prefix + "_test", { vf_dcp });
        vf_dcp->text[0]->set_use(true);
 
-       auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
        player->set_always_burn_open_subtitles();
        while (!player->pass()) {}
 }

diff --git a/test/butler_test.cc b/test/butler_test.cc
index f7c307e3c923740068027e9882bd0b9f2ddcaf8c..b95aed4df52d16ca30ba1dc91f7522b2ac2b2a40 100644 (file)
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (butler_test1)
                map.set (i, i, 1);
        }
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
 
        Butler butler (
                film,
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (butler_test2)
                map.set (i, i, 1);
        }
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
 
        Butler butler (
                film,

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index fcecb82e4de9a76b72b57138869ee0157e20e978..cf836691999fc91d1adfbfe064dbc6bb26e8f569 100644 (file)
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
        ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
        test->examine_and_add_content (ov_content);
        BOOST_REQUIRE (!wait_for_jobs());
-       auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
        auto decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
        BOOST_REQUIRE (decoder);
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
        auto vf_content = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
        test->examine_and_add_content (vf_content);
        BOOST_REQUIRE (!wait_for_jobs());
-       player = make_shared<Player>(test, Image::Alignment::COMPACT);
+       player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
        decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
        BOOST_REQUIRE (decoder);
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
        auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
        test->examine_and_add_content (encrypted_content);
        BOOST_REQUIRE (!wait_for_jobs());
-       player = make_shared<Player>(test, Image::Alignment::COMPACT);
+       player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
        decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
        BOOST_REQUIRE (decoder);

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 3b08f998c42298dbc0e15ecbaa01690b86f40a24..c63c3c09205d6e6fe1dab63ce1380b626fa3c0e6 100644 (file)
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
        auto content = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
        auto film = new_test_film("dcp_playback_test", { content });
 
-       Player player(film, Image::Alignment::PADDED);
+       Player player(film, Image::Alignment::PADDED, false);
 
        auto butler = std::make_shared<Butler>(
                film,

diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index d994de91be1d4b74e85bb1f228f6f02b05906f41..6d43debcf30563a67325d4a648361c37e4f53f67 100644 (file)
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -95,7 +95,7 @@ test (boost::filesystem::path file)
        BOOST_REQUIRE_EQUAL (info.samplerate, 48000);
        ref_buffer.resize(info.samplerate * info.channels);
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
        player->Audio.connect (bind (&audio, _1, info.channels));
        while (!player->pass ()) {}

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 0248b5e40a887becec27fd6a2c28e27b65d7cec0..a106b7dde0506e4e695f8ff5d9077265822271a4 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        while (!player->pass ()) {}
 }
 
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        player->set_fast ();
        while (!player->pass ()) {}
 }
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        player->set_fast ();
        BOOST_CHECK_NO_THROW (while (!player->pass()) {});
 }

diff --git a/test/ffmpeg_decoder_error_test.cc b/test/ffmpeg_decoder_error_test.cc
index b53eabac516dde8ff477bedc62a306c62a387319..1d389661808103287d36213eaf7232c7542225f7 100644 (file)
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/ffmpeg_decoder_error_test.cc
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (check_exception_with_multiple_video_frames_per_packet)
 {
        auto content = content_factory(TestPaths::private_data() / "chk.mkv")[0];
        auto film = new_test_film("check_exception_with_multiple_video_frames_per_packet", { content });
-       auto player = std::make_shared<Player>(film, film->playlist());
+       auto player = std::make_shared<Player>(film, film->playlist(), false);
 
        while (!player->pass()) {}
 }

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index c0fe26ea32a50cfd3729be1397c23d8c7aaafb4d..43ef3eb68adbb7f192e5d2831e69b6eed2e6acdc 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -72,7 +72,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 
        auto content = make_shared<FFmpegContent>(path);
        auto film = new_test_film("ffmpeg_decoder_sequential_test_" + file.string(), { content });
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
        BOOST_REQUIRE (content->video_frame_rate());
        BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);

diff --git a/test/ffmpeg_subtitles_test.cc b/test/ffmpeg_subtitles_test.cc
index da63063cb8a48fa6a80438b1f69c476f2c09c26b..b7f81ff419d13e7ae9a65201815eabbe00e43673 100644 (file)
--- a/test/ffmpeg_subtitles_test.cc
+++ b/test/ffmpeg_subtitles_test.cc
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(decoding_ssa_subs_from_mkv)
 
        vector<string> lines;
 
-       auto player = make_shared<Player>(film, film->playlist());
+       auto player = make_shared<Player>(film, film->playlist(), false);
        player->Text.connect([&lines](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
                for (auto i: text.string) {
                        lines.push_back(i.text());

diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index 01d7a9fcbe6877cb09150cc8bb815aaf54d1e200..33a0bf8bdfa4f329ae448adddb9a970c3b0e3462 100644 (file)
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (overlap_video_test1)
        B->set_position(film, dcpomatic::DCPTime::from_seconds(1));
        C->set_position(film, dcpomatic::DCPTime::from_seconds(3));
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        auto pieces = player->_pieces;
        BOOST_REQUIRE_EQUAL (pieces.size(), 3U);
        BOOST_CHECK_EQUAL(pieces[0]->content, A);

diff --git a/test/player_test.cc b/test/player_test.cc
index cac5dffe958e5c986ba48f369bbb046f9830e1c2..eb49bc4df04f0f2afe3cac1bc85ec2c60cb3eac1 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 
        accumulated = std::make_shared<AudioBuffers>(film->audio_channels(), 0);
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.Audio.connect(bind(&accumulate, _1, _2));
        while (!player.pass()) {}
        BOOST_REQUIRE (accumulated->frames() >= 48000);
@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
        /* Length should be rounded up from B's length to the next video frame */
        BOOST_CHECK (film->length() == DCPTime::from_frames(3 * 24 + 1, 24));
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.setup_pieces();
        BOOST_REQUIRE_EQUAL(player._black._periods.size(), 1U);
        BOOST_CHECK(player._black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
        auto film = new_test_film("ffmpeg_transcoder_basic_test_subs", { c, s });
        film->set_audio_channels (6);
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.Video.connect(bind(&video, _1, _2));
        player.Audio.connect(bind(&audio, _1, _2));
        video_frames = audio_frames = 0;
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.set_fast();
        player.set_always_burn_open_subtitles();
        player.set_play_referenced();
@@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.set_fast();
        player.set_always_burn_open_subtitles();
        player.set_play_referenced();
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
        text->only_text()->set_type (TextType::CLOSED_CAPTION);
        text->only_text()->set_use (true);
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.set_ignore_video();
        player.set_ignore_audio();
 
@@ -339,7 +339,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
        film->examine_and_add_content (boon);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        player.set_fast();
        auto butler = std::make_shared<Butler>(
                film, player, AudioMapping(), 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false, Butler::Audio::ENABLED
@@ -472,7 +472,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
        auto content2 = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
        auto film2 = new_test_film("encrypted_dcp_with_no_kdm_gives_no_butler_error2", { content2 });
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        Butler butler(film2, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
 
        float buffer[2000 * 6];
@@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
        subs1->set_position(film, DCPTime());
        subs2->set_position(film, DCPTime());
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        dcp::Time last;
        player.Text.connect([&last](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
                for (auto sub: text.string) {
@@ -595,7 +595,7 @@ BOOST_AUTO_TEST_CASE(two_d_in_three_d_duplicates)
        B->set_position(film, DCPTime::from_seconds(10));
        B->video->set_custom_size(dcp::Size(1998, 1080));
 
-       auto player = std::make_shared<Player>(film, film->playlist());
+       auto player = std::make_shared<Player>(film, film->playlist(), false);
 
        std::vector<uint8_t> red_line(1998 * 3);
        for (int i = 0; i < 1998; ++i) {
@@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left)
 
        mono->set_position(film, dcpomatic::DCPTime::from_seconds(10));
 
-       auto player = std::make_shared<Player>(film, film->playlist());
+       auto player = std::make_shared<Player>(film, film->playlist(), false);
 
        std::vector<uint8_t> red_line(1998 * 3);
        for (int i = 0; i < 1998; ++i) {
@@ -690,7 +690,7 @@ BOOST_AUTO_TEST_CASE(check_seek_with_no_video)
 {
        auto content = content_factory(TestPaths::private_data() / "Fight.Club.1999.720p.BRRip.x264-x0r.srt")[0];
        auto film = new_test_film("check_seek_with_no_video", { content });
-       auto player = std::make_shared<Player>(film, film->playlist());
+       auto player = std::make_shared<Player>(film, film->playlist(), false);
 
        boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
 
@@ -721,7 +721,7 @@ BOOST_AUTO_TEST_CASE(unmapped_audio_does_not_raise_buffer_error)
 
        content->audio->set_mapping(AudioMapping(6 * 2, MAX_DCP_AUDIO_CHANNELS));
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        Butler butler(film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
 
        /* Wait for the butler thread to run for a while; in the case under test it will throw an exception because

diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index b358e7d3e4d38d6585b9d0d82fe32298bfdc2121..4c0204b697ac09b7877ecf9e8e06cb1dc066aa4b 100644 (file)
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE(no_error_with_ccap_that_mentions_no_font)
 {
        auto dcp = make_shared<DCPContent>("test/data/ccap_only");
        auto film = new_test_film("no_error_with_ccap_that_mentions_no_font", { dcp });
-       auto player = Player(film, film->playlist());
+       auto player = Player(film, film->playlist(), false);
        while (!player.pass()) {}
 }
 

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 27dd12cbe1875ff15383fd529735288a71efce88..0df7d9d20e998c3613b7fb71195fda9226e82a5c 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
        film->examine_and_add_content(B);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       Player player(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT, false);
        int const audio_channels = 2;
        auto butler = std::make_shared<Butler>(
                film, player, AudioMapping(), audio_channels, boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 6c2b92a391692a576921726e2aaed296eb3438b5..386e50e2580b118f992e3b46e96043cfc390517d 100644 (file)
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        film->set_sequence (false);
        film->add_content (content);
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (film, DCPTime());
@@ -402,7 +402,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        film->set_sequence (false);
        film->add_content (content);
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (film, DCPTime());
@@ -579,7 +579,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_sequence (false);
        film->add_content (content);
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
        /* Position 0, no trim, video/audio content rate = video/audio DCP rate */
        content->set_position (film, DCPTime());

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 29af9805b5823770c0f3290764b6fe2ffb5731a0..4ab40563a48687bcc027ef931e1737c4a503e98a 100644 (file)
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        Ls = sf_open ("build/test/upmixer_a_test/Ls.wav", SFM_WRITE, &info);
        Rs = sf_open ("build/test/upmixer_a_test/Rs.wav", SFM_WRITE, &info);
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        player->Audio.connect (bind (&write, _1, _2));
        while (!player->pass()) {}
 

diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index f210f2adda9c9478dc02b78cc9402c63fa208595..91deb9b9b4a7fba489cc7f53cbb5f7d32c1c8654 100644 (file)
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
        auto content = content_factory(file);
        auto film = new_test_film("ffmpeg_image_video_range_expanded", content);
        content[0]->video->set_range (VideoRange::VIDEO);
-       auto player = make_shared<Player>(film, film->playlist());
+       auto player = make_shared<Player>(film, film->playlist(), false);
 
        shared_ptr<PlayerVideo> player_video;
        player->Video.connect([&player_video](shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime) {

diff --git a/test/video_trim_test.cc b/test/video_trim_test.cc
index c4b24b449a97eef2706213f012b88b2c000554e5..067e81eaf2a26d1d3dbbf73d96ad2bea35155505 100644 (file)
--- a/test/video_trim_test.cc
+++ b/test/video_trim_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(video_trim_test)
 
        shared_ptr<PlayerVideo> first_video;
 
-       auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+       auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
        player->Video.connect([&first_video](shared_ptr<PlayerVideo> video, dcpomatic::DCPTime) {
              first_video = video;
        });