diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-15 00:26:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-15 00:26:22 +0100 |
| commit | 040d5792b67e3ac1f3d023acc905b36748ddb85f (patch) | |
| tree | c790bf8f01615ecc65e1dcb57c2a8378865f9dff /src/lib | |
| parent | 05b7e2aa4b4c0053ed822cdcc891cd29e8348ab4 (diff) | |
Add default J2K bandwidth option.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 3 | ||||
| -rw-r--r-- | src/lib/config.h | 9 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index e0fbcc703..82a5b1095 100644 --- 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_j2k_bandwidth (200000000) { _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_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000); } 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)); + root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth)); doc.write_to_file_formatted (file (false)); } diff --git a/src/lib/config.h b/src/lib/config.h index f3e8f1441..38664f093 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -118,6 +118,10 @@ public: 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; @@ -196,6 +200,10 @@ public: void set_dcp_metadata (libdcp::XMLMetadata m) { _dcp_metadata = m; } + + void set_default_j2k_bandwidth (int b) { + _default_j2k_bandwidth = b; + } void write () const; @@ -239,6 +247,7 @@ private: 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; diff --git a/src/lib/film.cc b/src/lib/film.cc index 295f80ccb..d216e303f 100644 --- 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) - , _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) |