+2017-08-27 Carl Hetherington <cth@carlh.net>
+
+ * Fix incorrect ISDCF name in some cases (#1118).
+
2017-08-26 Carl Hetherington <cth@carlh.net>
* Stop the player looking for encode servers (#1119).
/* XXX: this uses the first bit of content only */
- /* The standard says we don't do this for trailers, for some strange reason */
+ /* Interior aspect ratio. The standard says we don't do this for trailers, for some strange reason */
if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) {
Ratio const * content_ratio = 0;
BOOST_FOREACH (shared_ptr<Content> i, content ()) {
}
if (content_ratio && content_ratio != container()) {
- d += "-" + content_ratio->isdcf_name();
+ /* This needs to be the numeric version of the ratio, and ::id() is close enough */
+ d += "-" + content_ratio->id();
}
}
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
+ /* And it should always be numeric */
+
+ content->video->set_scale (VideoContentScale (Ratio::from_id ("239")));
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-239_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
+ content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
+
/* Test 3D */
film->set_three_d (true);