projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
05b7e2a
)
Add default J2K bandwidth option.
author
Carl Hetherington
<cth@carlh.net>
Sun, 14 Jul 2013 23:26:22 +0000
(
00:26
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 14 Jul 2013 23:26:22 +0000
(
00:26
+0100)
src/lib/config.cc
patch
|
blob
|
history
src/lib/config.h
patch
|
blob
|
history
src/lib/film.cc
patch
|
blob
|
history
src/wx/config_dialog.cc
patch
|
blob
|
history
src/wx/config_dialog.h
patch
|
blob
|
history
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index e0fbcc703f58042948cb3a1dc83aa62d58f09fe3..82a5b10954bac80a571cf5b9b70530859b8156c4 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-54,6
+54,7
@@
Config::Config ()
, _default_still_length (10)
, _default_container (Ratio::from_id ("185"))
, _default_dcp_content_type (0)
, _default_still_length (10)
, _default_container (Ratio::from_id ("185"))
, _default_dcp_content_type (0)
+ , _default_j2k_bandwidth (200000000)
{
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (25);
{
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (25);
@@
-110,6
+111,7
@@
Config::read ()
_default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
_default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
+ _default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
}
void
}
void
@@
-241,6
+243,7
@@
Config::write () const
_default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
_default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
+ root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth));
doc.write_to_file_formatted (file (false));
}
doc.write_to_file_formatted (file (false));
}
diff --git
a/src/lib/config.h
b/src/lib/config.h
index f3e8f1441b918bd23282f5adfc2f8bb46a20d9e6..38664f093f33d79235c7cdb333ac8333d5196afe 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-118,6
+118,10
@@
public:
return _dcp_metadata;
}
return _dcp_metadata;
}
+ int default_j2k_bandwidth () const {
+ return _default_j2k_bandwidth;
+ }
+
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
@@
-196,6
+200,10
@@
public:
void set_dcp_metadata (libdcp::XMLMetadata m) {
_dcp_metadata = m;
}
void set_dcp_metadata (libdcp::XMLMetadata m) {
_dcp_metadata = m;
}
+
+ void set_default_j2k_bandwidth (int b) {
+ _default_j2k_bandwidth = b;
+ }
void write () const;
void write () const;
@@
-239,6
+247,7
@@
private:
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
libdcp::XMLMetadata _dcp_metadata;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
libdcp::XMLMetadata _dcp_metadata;
+ int _default_j2k_bandwidth;
/** Singleton instance, or 0 */
static Config* _instance;
/** Singleton instance, or 0 */
static Config* _instance;
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 295f80ccbaedc7fcedb74e31d2dbd352d8dfee26..d216e303f65f235a33a2cf962fd3df8696b4ba94 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-94,7
+94,7
@@
Film::Film (string d)
, _container (Config::instance()->default_container ())
, _scaler (Scaler::from_id ("bicubic"))
, _with_subtitles (false)
, _container (Config::instance()->default_container ())
, _scaler (Scaler::from_id ("bicubic"))
, _with_subtitles (false)
- , _j2k_bandwidth (
200000000
)
+ , _j2k_bandwidth (
Config::instance()->default_j2k_bandwidth ()
)
, _dci_metadata (Config::instance()->default_dci_metadata ())
, _dcp_video_frame_rate (24)
, _dcp_audio_channels (MAX_AUDIO_CHANNELS)
, _dci_metadata (Config::instance()->default_dci_metadata ())
, _dcp_video_frame_rate (24)
, _dcp_audio_channels (MAX_AUDIO_CHANNELS)
diff --git
a/src/wx/config_dialog.cc
b/src/wx/config_dialog.cc
index 76cb331de5ff33938d675b59d932ecb317f0ad93..618baca2c9c4f6c71ae2377c236eedb790e4885b 100644
(file)
--- a/
src/wx/config_dialog.cc
+++ b/
src/wx/config_dialog.cc
@@
-134,6
+134,11
@@
ConfigDialog::make_misc_panel ()
_default_dcp_content_type = new wxChoice (_misc_panel, wxID_ANY);
table->Add (_default_dcp_content_type);
table->AddSpacer (1);
_default_dcp_content_type = new wxChoice (_misc_panel, wxID_ANY);
table->Add (_default_dcp_content_type);
table->AddSpacer (1);
+
+ add_label_to_sizer (table, _misc_panel, _("Default JPEG2000 bandwidth"), true);
+ _default_j2k_bandwidth = new wxSpinCtrl (_misc_panel);
+ table->Add (_default_j2k_bandwidth, 1);
+ add_label_to_sizer (table, _misc_panel, _("MBps"), false);
Config* config = Config::instance ();
Config* config = Config::instance ();
@@
-192,6
+197,10
@@
ConfigDialog::make_misc_panel ()
}
_default_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::default_dcp_content_type_changed), 0, this);
}
_default_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::default_dcp_content_type_changed), 0, this);
+
+ _default_j2k_bandwidth->SetRange (50, 250);
+ _default_j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1e6);
+ _default_j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::default_j2k_bandwidth_changed), 0, this);
}
void
}
void
@@
-500,3
+509,9
@@
ConfigDialog::creator_changed (wxCommandEvent &)
m.creator = wx_to_std (_creator->GetValue ());
Config::instance()->set_dcp_metadata (m);
}
m.creator = wx_to_std (_creator->GetValue ());
Config::instance()->set_dcp_metadata (m);
}
+
+void
+ConfigDialog::default_j2k_bandwidth_changed (wxCommandEvent &)
+{
+ Config::instance()->set_default_j2k_bandwidth (_default_j2k_bandwidth->GetValue() * 1e6);
+}
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index 459d64dd701327c2e8bd07f6f5f9e027aae58ebd..8d9c7af52db2ddf9734e7d959d0f65386c092af4 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-59,6
+59,7
@@
private:
void default_dcp_content_type_changed (wxCommandEvent &);
void issuer_changed (wxCommandEvent &);
void creator_changed (wxCommandEvent &);
void default_dcp_content_type_changed (wxCommandEvent &);
void issuer_changed (wxCommandEvent &);
void creator_changed (wxCommandEvent &);
+ void default_j2k_bandwidth_changed (wxCommandEvent &);
void add_server_to_control (ServerDescription *);
void setup_language_sensitivity ();
void add_server_to_control (ServerDescription *);
void setup_language_sensitivity ();
@@
-95,5
+96,6
@@
private:
wxButton* _remove_server;
wxTextCtrl* _issuer;
wxTextCtrl* _creator;
wxButton* _remove_server;
wxTextCtrl* _issuer;
wxTextCtrl* _creator;
+ wxSpinCtrl* _default_j2k_bandwidth;
};
};