From 5555e580ecbfe6612ac5d18391fc0f6f96b96ac5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 30 Jun 2024 23:45:48 +0200 Subject: Bump libdcp to get FFmpeg 7.0.1. This involves fixing a test whose references were wrong, as far as I can see. The new comment reflects what I think should have been happening the whole time. --- cscript | 4 ++-- test/data | 2 +- test/video_level_test.cc | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cscript b/cscript index c5e2df9e9..dd181b6fc 100644 --- a/cscript +++ b/cscript @@ -533,7 +533,7 @@ def make_spec(filename, version, target, options, requires=None): print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target, options): - deps = [('libdcp', 'v1.9.10', {'c++17': target.platform == 'osx'})] + deps = [('libdcp', 'v1.9.11', {'c++17': target.platform == 'osx'})] deps.append(('libsub', 'v1.6.49')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) @@ -544,7 +544,7 @@ def dependencies(target, options): deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) - deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419')) + deps.append(('ffcmp', 'd7fabbe7bf85a7fc25963cfbeb9be83eb9edaef3')) return deps diff --git a/test/data b/test/data index 3a3b29c0f..e789dcb87 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 3a3b29c0f1e9e2654ddee2028be623e1e1b3a33f +Subproject commit e789dcb8769e329e33b2eb94f283c69f91deb925 diff --git a/test/video_level_test.cc b/test/video_level_test.cc index 69a8af89e..f210f2add 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -324,6 +324,7 @@ movie_V (string name) } +/** @return Film containing video-range content set as full-range */ static shared_ptr movie_VoF (string name) @@ -353,6 +354,8 @@ movie_F (string name) film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); + BOOST_CHECK(content->video->range() == VideoRange::FULL); + auto range = pixel_range (film, content); BOOST_CHECK_EQUAL (range.first, 0); BOOST_CHECK_EQUAL (range.second, 1023); @@ -546,8 +549,11 @@ BOOST_AUTO_TEST_CASE (movie_VoF_to_V_movie) BOOST_AUTO_TEST_CASE (movie_F_to_V_movie) { auto range = V_movie_range (movie_F("movie_F_to_V_movie")); - BOOST_CHECK_EQUAL (range.first, 4); - BOOST_CHECK_EQUAL (range.second, 1019); + /* A full range input has been converted to video range, so that what was black at 0 + * is not black at 64 (with the corresponding change to white) + */ + BOOST_CHECK_EQUAL(range.first, 64); + BOOST_CHECK_EQUAL(range.second, 963); } -- cgit v1.2.3