X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.cc;h=016c21fdea09fb60d45636f91d2ee9b5d888879b;hb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;hp=d99ed926a2ac42df20ed7216c716bb9a91256ddd;hpb=7b76135b6c7082815fb4fe1e703f3f15182e6bf3;p=dcpomatic.git diff --git a/src/lib/format.cc b/src/lib/format.cc index d99ed926a..016c21fde 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -28,28 +28,20 @@ #include #include #include "format.h" +#include "film.h" -using namespace std; +using std::string; +using std::setprecision; +using std::stringstream; +using std::vector; +using boost::shared_ptr; +using libdcp::Size; vector Format::_formats; -/** @param r Ratio multiplied by 100 (e.g. 185) - * @param dcp Size (in pixels) of the images that we should put in a DCP. - * @param id ID (e.g. 185) - * @param n Nick name (e.g. Flat) - */ -Format::Format (int r, Size dcp, string id, string n) - : _ratio (r) - , _dcp_size (dcp) - , _id (id) - , _nickname (n) -{ - -} - /** @return A name to be presented to the user */ string -Format::name () const +FixedFormat::name () const { stringstream s; if (!_nickname.empty ()) { @@ -76,29 +68,19 @@ Format::as_metadata () const void Format::setup_formats () { - _formats.push_back (new Format (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat")); - _formats.push_back (new Format (137, Size (1480, 1080), "137", "Academy")); - _formats.push_back (new Format (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat")); - _formats.push_back (new Format (185, Size (1998, 1080), "185", "Flat")); - _formats.push_back (new Format (239, Size (2048, 858), "239", "Scope")); -} - -/** @param r Ratio multiplied by 100. - * @return Matching Format, or 0. - */ -Format const * -Format::from_ratio (int r) -{ - vector::iterator i = _formats.begin (); - while (i != _formats.end() && (*i)->ratio_as_integer() != r) { - ++i; - } - - if (i == _formats.end ()) { - return 0; - } - - return *i; + _formats.push_back (new FixedFormat (119, libdcp::Size (1285, 1080), "119", "1.19", "F")); + _formats.push_back (new FixedFormat (133, libdcp::Size (1436, 1080), "133", "1.33", "F")); + _formats.push_back (new FixedFormat (138, libdcp::Size (1485, 1080), "138", "1.375", "F")); + _formats.push_back (new FixedFormat (133, libdcp::Size (1998, 1080), "133-in-flat", "4:3 within Flat", "F")); + _formats.push_back (new FixedFormat (137, libdcp::Size (1480, 1080), "137", "Academy", "F")); + _formats.push_back (new FixedFormat (166, libdcp::Size (1793, 1080), "166", "1.66", "F")); + _formats.push_back (new FixedFormat (166, libdcp::Size (1998, 1080), "166-in-flat", "1.66 within Flat", "F")); + _formats.push_back (new FixedFormat (178, libdcp::Size (1998, 1080), "178-in-flat", "16:9 within Flat", "F")); + _formats.push_back (new FixedFormat (178, libdcp::Size (1920, 1080), "178", "16:9", "F")); + _formats.push_back (new FixedFormat (185, libdcp::Size (1998, 1080), "185", "Flat", "F")); + _formats.push_back (new FixedFormat (239, libdcp::Size (2048, 858), "239", "Scope", "S")); + _formats.push_back (new VariableFormat (libdcp::Size (1998, 1080), "var-185", "Flat", "F")); + _formats.push_back (new VariableFormat (libdcp::Size (2048, 858), "var-239", "Scope", "S")); } /** @param n Nickname. @@ -147,45 +129,32 @@ Format::from_metadata (string m) return from_id (m); } -/** @param f A Format. - * @return Index of f within our static list, or -1. - */ -int -Format::as_index (Format const * f) +/** @return All available formats */ +vector +Format::all () { - vector::size_type i = 0; - while (i < _formats.size() && _formats[i] != f) { - ++i; - } - - if (i == _formats.size ()) { - return -1; - } - - return i; + return _formats; } -/** @param i An index returned from as_index(). - * @return Corresponding Format. +/** @param r Ratio multiplied by 100 (e.g. 185) + * @param dcp Size (in pixels) of the images that we should put in a DCP. + * @param id ID (e.g. 185) + * @param n Nick name (e.g. Flat) */ -Format const * -Format::from_index (int i) +FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d) + : Format (dcp, id, n, d) + , _ratio (r) { - assert (i >= 0 && i < int(_formats.size ())); - return _formats[i]; -} -/** @return All available formats */ -vector -Format::all () -{ - return _formats; } +/** @return Number of pixels (int the DCP image) to pad either side of the film + * (so there are dcp_padding() pixels on the left and dcp_padding() on the right) + */ int -Format::dcp_padding () const +Format::dcp_padding (shared_ptr f) const { - int p = rint ((_dcp_size.width - (_dcp_size.height * _ratio / 100.0)) / 2.0); + int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0); /* This comes out -ve for Scope; bodge it */ if (p < 0) { @@ -194,3 +163,34 @@ Format::dcp_padding () const return p; } + +float +Format::container_ratio_as_float () const +{ + return static_cast (_dcp_size.width) / _dcp_size.height; +} + +VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d) + : Format (dcp, id, n, d) +{ + +} + +int +VariableFormat::ratio_as_integer (shared_ptr f) const +{ + return rint (ratio_as_float (f) * 100); +} + +float +VariableFormat::ratio_as_float (shared_ptr f) const +{ + return float (f->size().width) / f->size().height; +} + +/** @return A name to be presented to the user */ +string +VariableFormat::name () const +{ + return _nickname; +}