X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.cc;h=5eda9eb889ef1896b9a86613259b12424a58c49f;hb=e94cd129dcd66a76210880bfdf19d27f7992651b;hp=115e036915d7d35700cee8518339692c6fa86349;hpb=7c798f9e215282afb078da53b1d41d4c99e11f5d;p=dcpomatic.git diff --git a/src/lib/format.cc b/src/lib/format.cc index 115e03691..5eda9eb88 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -29,8 +29,16 @@ #include #include "format.h" #include "film.h" +#include "playlist.h" -using namespace std; +#include "i18n.h" + +using std::string; +using std::setprecision; +using std::stringstream; +using std::vector; +using boost::shared_ptr; +using libdcp::Size; vector Format::_formats; @@ -40,13 +48,13 @@ FixedFormat::name () const { stringstream s; if (!_nickname.empty ()) { - s << _nickname << " ("; + s << _nickname << N_(" ("); } - s << setprecision(3) << (_ratio / 100.0) << ":1"; + s << setprecision(3) << (_ratio / 100.0) << N_(":1"); if (!_nickname.empty ()) { - s << ")"; + s << N_(")"); } return s.str (); @@ -63,18 +71,62 @@ Format::as_metadata () const void Format::setup_formats () { - _formats.push_back (new FixedFormat (119, Size (1285, 1080), "119", "1.19")); - _formats.push_back (new FixedFormat (133, Size (1436, 1080), "133", "1.33")); - _formats.push_back (new FixedFormat (138, Size (1485, 1080), "138", "1.375")); - _formats.push_back (new FixedFormat (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat")); - _formats.push_back (new FixedFormat (137, Size (1480, 1080), "137", "Academy")); - _formats.push_back (new FixedFormat (166, Size (1793, 1080), "166", "1.66")); - _formats.push_back (new FixedFormat (166, Size (1998, 1080), "166-in-flat", "1.66 within Flat")); - _formats.push_back (new FixedFormat (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat")); - _formats.push_back (new FixedFormat (185, Size (1998, 1080), "185", "Flat")); - _formats.push_back (new FixedFormat (239, Size (2048, 858), "239", "Scope")); - _formats.push_back (new VariableFormat (Size (1998, 1080), "var-185", "Flat")); - _formats.push_back (new VariableFormat (Size (2048, 858), "var-239", "Scope")); + /// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39. + _formats.push_back ( + new FixedFormat (119, libdcp::Size (1285, 1080), N_("119"), _("1.19"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (133, libdcp::Size (1436, 1080), N_("133"), _("1.33"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (138, libdcp::Size (1485, 1080), N_("138"), _("1.375"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (133, libdcp::Size (1998, 1080), N_("133-in-flat"), _("4:3 within Flat"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (137, libdcp::Size (1480, 1080), N_("137"), _("Academy"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (166, libdcp::Size (1793, 1080), N_("166"), _("1.66"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (166, libdcp::Size (1998, 1080), N_("166-in-flat"), _("1.66 within Flat"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (178, libdcp::Size (1998, 1080), N_("178-in-flat"), _("16:9 within Flat"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (178, libdcp::Size (1920, 1080), N_("178"), _("16:9"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F") + )); + + _formats.push_back ( + new FixedFormat (178, libdcp::Size (2048, 858), N_("178-in-scope"), _("16:9 within Scope"), N_("S") + )); + + _formats.push_back ( + new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S") + )); + + _formats.push_back ( + new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat without stretch"), N_("F") + )); + + _formats.push_back ( + new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope without stretch"), N_("S") + )); } /** @param n Nickname. @@ -123,34 +175,6 @@ 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) -{ - vector::size_type i = 0; - while (i < _formats.size() && _formats[i] != f) { - ++i; - } - - if (i == _formats.size ()) { - return -1; - } - - return i; -} - -/** @param i An index returned from as_index(). - * @return Corresponding Format. - */ -Format const * -Format::from_index (int i) -{ - assert (i >= 0 && i < int(_formats.size ())); - return _formats[i]; -} - /** @return All available formats */ vector Format::all () @@ -163,58 +187,56 @@ Format::all () * @param id ID (e.g. 185) * @param n Nick name (e.g. Flat) */ -FixedFormat::FixedFormat (int r, Size dcp, string id, string n) - : Format (dcp, id, n) +FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d) + : Format (dcp, id, n, d) , _ratio (r) { } +/** @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 (Film const * f) const +Format::dcp_padding (shared_ptr f) const { - int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0); + int pad = 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) { - p = 0; + if (pad < 0) { + pad = 0; } - return p; + return pad; } -VariableFormat::VariableFormat (Size dcp, string id, string n) - : Format (dcp, id, n) +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 (Film const * f) const +VariableFormat::ratio_as_integer (shared_ptr f) const { return rint (ratio_as_float (f) * 100); } float -VariableFormat::ratio_as_float (Film const * f) const +VariableFormat::ratio_as_float (shared_ptr f) const { - return float (f->size().width) / f->size().height; + return float (f->video_size().width) / f->video_size().height; } /** @return A name to be presented to the user */ string VariableFormat::name () const { - stringstream s; - if (!_nickname.empty ()) { - s << _nickname << " ("; - } - - s << "without stretching"; - - if (!_nickname.empty ()) { - s << ")"; - } - - return s.str (); + return _nickname; }