Fix colour range property for subsampled sources (#2357).

3 files changed, 66 insertions, 0 deletions

diff --git a/test/data b/test/data
-Subproject f2aeabb8ac65f4a4e16199fcf2f07b657352186
+Subproject 7c898df6d76579756af2f3e2577546764e97c13
diff --git a/test/ffmpeg_properties_test.cc b/test/ffmpeg_properties_test.cc
new file mode 100644
index 000000000..15773ec2f
--- /dev/null
+++ b/test/ffmpeg_properties_test.cc
@@ -0,0 +1,65 @@
+/*
+    Copyright (C) 2022 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/compose.hpp"
+#include "lib/content.h"
+#include "lib/content_factory.h"
+#include "lib/user_property.h"
+#include "test.h"
+#include <boost/test/unit_test.hpp>
+
+
+using std::list;
+using std::string;
+
+
+static
+void
+colour_range_test(string name, boost::filesystem::path file, string ref)
+{
+	auto content = content_factory(file);
+	BOOST_REQUIRE(!content.empty());
+	auto film = new_test_film2(String::compose("ffmpeg_properties_test_%1", name), { content.front() });
+
+	auto properties = content.front()->user_properties(film);
+	auto iter = std::find_if(properties.begin(), properties.end(), [](UserProperty const& property) { return property.key == "Colour range"; });
+	BOOST_REQUIRE(iter != properties.end());
+	BOOST_CHECK_EQUAL(iter->value, ref);
+}
+
+
+BOOST_AUTO_TEST_CASE(ffmpeg_properties_test)
+{
+	colour_range_test("1", "test/data/test.mp4", "Unspecified");
+	colour_range_test("2", TestPaths::private_data() / "arrietty_JP-EN.mkv", "Limited / video (16-235)");
+	colour_range_test("3", "test/data/8bit_full_420.mp4", "Full (0-255)");
+	colour_range_test("4", "test/data/8bit_full_422.mp4", "Full (0-255)");
+	colour_range_test("5", "test/data/8bit_full_444.mp4", "Full (0-255)");
+	colour_range_test("6", "test/data/8bit_video_420.mp4", "Limited / video (16-235)");
+	colour_range_test("7", "test/data/8bit_video_422.mp4", "Limited / video (16-235)");
+	colour_range_test("8", "test/data/8bit_video_444.mp4", "Limited / video (16-235)");
+	colour_range_test("9", "test/data/10bit_full_420.mp4", "Full (0-1023)");
+	colour_range_test("10", "test/data/10bit_full_422.mp4", "Full (0-1023)");
+	colour_range_test("11", "test/data/10bit_full_444.mp4", "Full (0-1023)");
+	colour_range_test("12", "test/data/10bit_video_420.mp4", "Limited / video (64-940)");
+	colour_range_test("13", "test/data/10bit_video_422.mp4", "Limited / video (64-940)");
+	colour_range_test("14", "test/data/10bit_video_444.mp4", "Limited / video (64-940)");
+}
diff --git a/test/wscript b/test/wscript
index 9cf13dea5..fc63aac1e 100644
--- a/test/wscript
+++ b/test/wscript
@@ -85,6 +85,7 @@ def build(bld):
                  ffmpeg_decoder_sequential_test.cc
                  ffmpeg_encoder_test.cc
                  ffmpeg_examiner_test.cc
+                 ffmpeg_properties_test.cc
                  ffmpeg_pts_offset_test.cc
                  file_group_test.cc
                  file_log_test.cc