summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-02 17:48:54 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-02 17:48:54 +0000
commit9458457504af5548bc51b3c29e65dbe92fd0513d (patch)
tree848f587f33cd8b00eb7cac3704960633c89a13f3 /test
parent6375948ecd5ae22b045ed5bd518d8b05345e8c68 (diff)
Add test for incorrect ISDCF name with full-frame content, and fix it (#1118).
Diffstat (limited to 'test')
-rw-r--r--test/isdcf_name_test.cc3
-rw-r--r--test/ratio_test.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index f59e02edf..96ef5a420 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -97,6 +97,9 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
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 ("190")));
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-190_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
/* Test 3D */
diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index 573e8899e..43f1d2a15 100644
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (ratio_test)
BOOST_CHECK (r);
BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 858));
- r = Ratio::from_id ("full-frame");
+ r = Ratio::from_id ("190");
BOOST_CHECK (r);
BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 1080));
}