projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test with new sequencing behaviour for subtitle content.
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index 441af6bf30514ecb2eaaafa58ae7deea3ffdaa16..b6b38e1260e58ec4f98385a1f2f788c623eb842b 100644
(file)
--- a/
test/scaling_test.cc
+++ b/
test/scaling_test.cc
@@
-63,15
+63,21
@@
BOOST_AUTO_TEST_CASE (scaling_test)
film->examine_and_add_content (imc);
wait_for_jobs ();
film->examine_and_add_content (imc);
wait_for_jobs ();
-
- imc->set_video_length (ContentTime::from_frames (1, 24));
+ imc->set_video_length (1);
+
+ /* F-133: 133 image in a flat container */
scaling_test_for (film, imc, "133", "185");
scaling_test_for (film, imc, "133", "185");
+ /* F: flat image in a flat container */
scaling_test_for (film, imc, "185", "185");
scaling_test_for (film, imc, "185", "185");
+ /* F-S: scope image in a flat container */
scaling_test_for (film, imc, "239", "185");
scaling_test_for (film, imc, "239", "185");
+ /* S-133: 133 image in a scope container */
scaling_test_for (film, imc, "133", "239");
scaling_test_for (film, imc, "133", "239");
+ /* S-F: flat image in a scope container */
scaling_test_for (film, imc, "185", "239");
scaling_test_for (film, imc, "185", "239");
+ /* S: scope image in a scope container */
scaling_test_for (film, imc, "239", "239");
}
scaling_test_for (film, imc, "239", "239");
}