Remove default video bit rate settings.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5401839e37743fbe88551e4b5386b852a17f3f6f..a446b37cacb9f7edfa835e5990ecb6714851f2d7 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -787,10 +787,6 @@ Config::write_config () const
 
        /* [XML] DefaultStillLength Default length (in seconds) for still images in new films. */
        cxml::add_text_child(root, "DefaultStillLength", raw_convert<string>(_default_still_length));
-       /* [XML] DefaultJ2KVideoBitRate Default bitrate (in bits per second) for JPEG2000 data in new films. */
-       cxml::add_text_child(root, "DefaultJ2KVideoBitRate", raw_convert<string>(_default_video_bit_rate[VideoEncoding::JPEG2000]));
-       /* [XML] DefaultMPEG2VideoBitRate Default bitrate (in bits per second) for MPEG2 data in new films. */
-       cxml::add_text_child(root, "DefaultMPEG2VideoBitRate", raw_convert<string>(_default_video_bit_rate[VideoEncoding::MPEG2]));
        /* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */
        cxml::add_text_child(root, "DefaultAudioDelay", raw_convert<string>(_default_audio_delay));
        /* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */

diff --git a/src/lib/config.h b/src/lib/config.h
index aaeada4e68616b37d7f0b91582491064154f5c08..4fccf2d5ccc84990270f379fd12ece1fcfa87e09 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -794,10 +794,6 @@ public:
                maybe_set (_dcp_j2k_comment, c);
        }
 
-       void set_default_video_bit_rate(VideoEncoding encoding, int64_t b) {
-               maybe_set(_default_video_bit_rate[encoding], b);
-       }
-
        void set_default_audio_delay (int d) {
                maybe_set (_default_audio_delay, d);
        }

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 67813ba0be64a0dea8f64df1fb28b8f4896c6c2f..856f701139d4242a10db82b61d407194501e9259 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -310,24 +310,6 @@ private:
 #endif
                table->Add (_directory, 1, wxEXPAND);
 
-               {
-                       add_label_to_sizer(table, _panel, _("Default JPEG2000 bit rate"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       auto s = new wxBoxSizer (wxHORIZONTAL);
-                       _j2k_video_bit_rate = new wxSpinCtrl(_panel);
-                       s->Add(_j2k_video_bit_rate);
-                       add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       table->Add (s, 1);
-               }
-
-               {
-                       add_label_to_sizer(table, _panel, _("Default MPEG2 bit rate"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       auto s = new wxBoxSizer (wxHORIZONTAL);
-                       _mpeg2_video_bit_rate = new wxSpinCtrl(_panel);
-                       s->Add(_mpeg2_video_bit_rate);
-                       add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       table->Add (s, 1);
-               }
-
                {
                        add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
                        auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -401,11 +383,6 @@ private:
 
                _use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-               _j2k_video_bit_rate->SetRange(50, 250);
-               _j2k_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&DefaultsPage::j2k_video_bit_rate_changed, this));
-               _mpeg2_video_bit_rate->SetRange(1, 50);
-               _mpeg2_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&DefaultsPage::mpeg2_video_bit_rate_changed, this));
-
                _audio_delay->SetRange (-1000, 1000);
                _audio_delay->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::audio_delay_changed, this));
 
@@ -436,10 +413,6 @@ private:
                _kdm_directory->SetPath (std_to_wx (config->default_kdm_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
                _kdm_type->set (config->default_kdm_type());
                checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default());
-               checked_set(_j2k_video_bit_rate, config->default_video_bit_rate(VideoEncoding::JPEG2000) / 1000000);
-               _j2k_video_bit_rate->SetRange(50, config->maximum_video_bit_rate(VideoEncoding::JPEG2000) / 1000000);
-               checked_set(_mpeg2_video_bit_rate, config->default_video_bit_rate(VideoEncoding::MPEG2) / 1000000);
-               _mpeg2_video_bit_rate->SetRange(1, config->maximum_video_bit_rate(VideoEncoding::MPEG2) / 1000000);
                checked_set (_audio_delay, config->default_audio_delay ());
                checked_set (_standard, config->default_interop() ? 1 : 0);
                auto dal = config->default_audio_language();
@@ -513,16 +486,6 @@ private:
                config->set_default_kdm_duration (RoughDuration(duration, unit));
        }
 
-       void j2k_video_bit_rate_changed()
-       {
-               Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, _j2k_video_bit_rate->GetValue() * 1000000);
-       }
-
-       void mpeg2_video_bit_rate_changed()
-       {
-               Config::instance()->set_default_video_bit_rate(VideoEncoding::MPEG2, _mpeg2_video_bit_rate->GetValue() * 1000000);
-       }
-
        void audio_delay_changed ()
        {
                Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
@@ -609,8 +572,6 @@ private:
                }
        }
 
-       wxSpinCtrl* _j2k_video_bit_rate;
-       wxSpinCtrl* _mpeg2_video_bit_rate;
        wxSpinCtrl* _audio_delay;
        wxSpinCtrl* _still_length;
 #ifdef DCPOMATIC_USE_OWN_PICKER

diff --git a/test/content_test.cc b/test/content_test.cc
index 06d186da6bd327d2c829dc2488b256405ec67126..b9a25a02b61e25dd50de97cd3c718002832060e9 100644 (file)
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -146,6 +146,7 @@ BOOST_AUTO_TEST_CASE (content_test6)
                );
 
        film->set_audio_channels(16);
+       film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 
        make_and_verify_dcp (film);
        check_dcp (TestPaths::private_data() / "v2.18.x" / "fha", film);

diff --git a/test/data b/test/data
index a70f9301976da3137b61d217ccdc13ee8c615a5f..04dde6faddc797652ead4f75d27dfdd48db77ddc 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit a70f9301976da3137b61d217ccdc13ee8c615a5f
+Subproject commit 04dde6faddc797652ead4f75d27dfdd48db77ddc

diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index cd8df90cb387066c94bf04116dbdfee1af1b1734..441d641664dc09b7d9dd582aafdc8cd1dbabbe77 100644 (file)
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -77,6 +77,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
        auto A = content_factory(TestPaths::private_data() / "dolby_aurora.vob")[0];
        auto B = content_factory(TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov")[0];
        auto film = new_test_film("no_use_video_test2", { A, B }, &cl);
+       film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
        A->set_position (film, dcpomatic::DCPTime());
        B->set_position (film, dcpomatic::DCPTime());
        A->video->set_use (false);

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 49e41bff34a5a1bcc12fab73a451f4f75833f8cf..c46a4f70dcbf279521314e5160b8b6f132c0b4e9 100644 (file)
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -36,6 +36,7 @@ using std::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 {
        auto film = new_test_film("remake_with_subtitle_test");
+       film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
        auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv")[0]);
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());

diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index caff70778700391631a466d42e259ffd215e2fa0..0648ec477d2f755eeaf1535a8d8c793fd47135e1 100644 (file)
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -52,6 +52,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
        film->set_reel_type (ReelType::BY_LENGTH);
        film->set_interop (true);
        film->set_reel_length (1024 * 1024 * 512);
+       film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
        make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
        dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name());

diff --git a/test/test.cc b/test/test.cc
index f81db8f914bb61f00b5c618c7a5b5dd29ab12788..8efbf3225a6176d9ff3d9d325126e408a94b0d64 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -121,7 +121,6 @@ setup_test_config ()
        Config::instance()->set_server_encoding_threads (1);
        Config::instance()->set_server_port_base (61921);
        Config::instance()->set_default_audio_delay (0);
-       Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
        Config::instance()->set_default_interop (false);
        Config::instance()->set_default_still_length (10);
        Config::instance()->set_log_types (