#include <iomanip>
#include <iostream>
#include "format.h"
+#include "film.h"
+#include "playlist.h"
-using namespace std;
+#include "i18n.h"
-vector<Format const *> 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)
-{
+using std::string;
+using std::setprecision;
+using std::stringstream;
+using std::vector;
+using boost::shared_ptr;
+using libdcp::Size;
-}
+vector<Format const *> Format::_formats;
/** @return A name to be presented to the user */
string
-Format::name () const
+FixedFormat::name () const
{
stringstream s;
if (!_nickname.empty ()) {
- s << _nickname << " (";
+ s << _nickname << N_(" (");
}
- s << setprecision(3) << (_ratio / 100.0) << ":1";
+ s << setprecision(3) << _ratio << N_(":1");
if (!_nickname.empty ()) {
- s << ")";
+ s << N_(")");
}
return s.str ();
}
-/** @return Identifier for this format as metadata for a Film's metadata file */
-string
-Format::as_metadata () const
-{
- return _id;
-}
-
/** Fill our _formats vector with all available formats */
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<Format const *>::iterator i = _formats.begin ();
- while (i != _formats.end() && (*i)->ratio_as_integer() != r) {
- ++i;
- }
-
- if (i == _formats.end ()) {
- return 0;
- }
-
- return *i;
+ /// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39.
+ _formats.push_back (
+ new FixedFormat (1.19, libdcp::Size (1285, 1080), "119", _("1.19"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (4.0 / 3.0, libdcp::Size (1436, 1080), "133", _("4:3"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.38, libdcp::Size (1485, 1080), "138", _("1.375"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (4.0 / 3.0, libdcp::Size (1998, 1080), "133-in-flat", _("4:3 within Flat"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.37, libdcp::Size (1480, 1080), "137", _("Academy"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.66, libdcp::Size (1793, 1080), "166", _("1.66"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.66, libdcp::Size (1998, 1080), "166-in-flat", _("1.66 within Flat"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.78, libdcp::Size (1998, 1080), "178-in-flat", _("16:9 within Flat"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.78, libdcp::Size (1920, 1080), "178", _("16:9"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.85, libdcp::Size (1998, 1080), "185", _("Flat"), "F"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.78, libdcp::Size (2048, 858), "178-in-scope", _("16:9 within Scope"), "S"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (2.39, libdcp::Size (2048, 858), "239", _("Scope"), "S"
+ ));
+
+ _formats.push_back (
+ new FixedFormat (1.896, libdcp::Size (2048, 1080), "full-frame", _("Full frame"), "C"
+ ));
+
+ _formats.push_back (
+ new VariableFormat (libdcp::Size (1998, 1080), "var-185", _("Flat without stretch"), "F"
+ ));
+
+ _formats.push_back (
+ new VariableFormat (libdcp::Size (2048, 858), "var-239", _("Scope without stretch"), "S"
+ ));
}
/** @param n Nickname.
return *j;
}
+/** @return All available formats */
+vector<Format const *>
+Format::all ()
+{
+ return _formats;
+}
-/** @param m Metadata, as returned from as_metadata().
- * @return Matching Format, or 0.
+/** @param r Ratio
+ * @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_metadata (string m)
+FixedFormat::FixedFormat (float r, libdcp::Size dcp, string id, string n, string d)
+ : Format (dcp, id, n, d)
+ , _ratio (r)
{
- return from_id (m);
+
}
-/** @param f A Format.
- * @return Index of f within our static list, or -1.
+/** @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::as_index (Format const * f)
+Format::dcp_padding (shared_ptr<const Film> f) const
{
- vector<Format*>::size_type i = 0;
- while (i < _formats.size() && _formats[i] != f) {
- ++i;
- }
+ int p = rint ((_dcp_size.width - (_dcp_size.height * ratio(f))) / 2.0);
- if (i == _formats.size ()) {
- return -1;
+ /* This comes out -ve for Scope; bodge it */
+ if (p < 0) {
+ p = 0;
}
-
- return i;
+
+ return p;
}
-/** @param i An index returned from as_index().
- * @return Corresponding Format.
- */
-Format const *
-Format::from_index (int i)
+float
+Format::container_ratio () const
{
- assert (i >= 0 && i < int(_formats.size ()));
- return _formats[i];
+ return static_cast<float> (_dcp_size.width) / _dcp_size.height;
}
-/** @return All available formats */
-vector<Format const *>
-Format::all ()
+VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
+ : Format (dcp, id, n, d)
{
- return _formats;
+
}
-int
-Format::dcp_padding () const
+float
+VariableFormat::ratio (shared_ptr<const Film> f) const
{
- int p = rint ((_dcp_size.width - (_dcp_size.height * _ratio / 100.0)) / 2.0);
+ /* XXX */
+ libdcp::Size const c;// = f->cropped_size (f->video_size ());
+ return float (c.width) / c.height;
+}
- /* This comes out -ve for Scope; bodge it */
- if (p < 0) {
- p = 0;
- }
-
- return p;
+/** @return A name to be presented to the user */
+string
+VariableFormat::name () const
+{
+ return _nickname;
}
projects / dcpomatic.git / blobdiff