diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-10 01:57:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-11 22:02:49 +0200 |
| commit | 15a83d720780d58f905d40f8493cdcb86596eaee (patch) | |
| tree | 96edb81d905bed4231819efc5bd6292aefaf2c4c /test/isdcf_name_test.cc | |
| parent | dd7c63112eda87f2e491261873075acff114396b (diff) | |
Change video content scaling so that it either:
1. scales the content up to fit the DCP container,
preserving aspect ratio, or
2. stretches the content to a custom aspect ratio, or
3. scales the content to some custom size.
Diffstat (limited to 'test/isdcf_name_test.cc')
| -rw-r--r-- | test/isdcf_name_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 3315833b0..487f80ea2 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) shared_ptr<ImageContent> content (new ImageContent ("test/data/simple_testcard_640x480.png")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - content->video->set_scale (VideoContentScale (Ratio::from_id ("133"))); + content->video->set_custom_ratio (1.33); film->set_container (Ratio::from_id ("185")); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV"); @@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) /* And it should always be numeric */ - content->video->set_scale (VideoContentScale (Ratio::from_id ("239"))); + content->video->set_custom_ratio (2.39); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-239_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV"); - content->video->set_scale (VideoContentScale (Ratio::from_id ("190"))); + content->video->set_custom_ratio (1.9); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-190_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV"); - content->video->set_scale (VideoContentScale (Ratio::from_id ("133"))); + content->video->set_custom_ratio (1.33); /* Test 3D */ |