X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fframe_info_hash_test.cc;h=ed91491665340ee56f4efe7ac3a7dd8fbc6c35f4;hb=b995947a86a583a44bbe667e9bbd031296bf7e88;hp=82e0f3ac0bd12246d950f383dfc8b44e737fc0f8;hpb=eac3cac07eb97a6bcf6accd1575af76cd6f59112;p=libdcp.git

diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 82e0f3ac..ed914916 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -31,42 +31,49 @@
     files in the program, then also delete it here.
 */
 
+
+#include "j2k_transcode.h"
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
-#include "j2k_transcode.h"
 #include "openjpeg_image.h"
+#include <boost/random.hpp>
 #include <boost/test/unit_test.hpp>
+#include <memory>
+
 
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
 
 static void
-check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string hash)
+check (shared_ptr<dcp::PictureAssetWriter> writer, boost::random::uniform_int_distribution<>& dist, boost::random::mt19937& rng, string hash)
 {
-	shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (1998, 1080)));
+	auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(1998, 1080));
 	for (int c = 0; c < 3; ++c) {
 		for (int p = 0; p < (1998 * 1080); ++p) {
-			xyz->data(c)[p] = rand_r (seed) & 0xfff;
+			xyz->data(c)[p] = dist(rng);
 		}
 	}
 
-	dcp::ArrayData data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
+	auto data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
 
-	dcp::FrameInfo info = writer->write (data.data(), data.size());
+	auto info = writer->write (data.data(), data.size());
 	BOOST_CHECK_EQUAL (info.hash, hash);
 }
 
+
 /** Test the hashing of data written to JPEG2000 MXFs with some random inputs */
 BOOST_AUTO_TEST_CASE (frame_info_hash_test)
 {
 	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	auto writer = mp->start_write ("build/test/frame_info_hash_test.mxf", false);
 
-	unsigned int seed = 42;
+	boost::random::mt19937 rng(1);
+	boost::random::uniform_int_distribution<> dist(0, 4095);
 
 	/* Check a few random frames */
-	check (&seed, writer, "9da3d1d93a80683e65d996edae4101ed");
-	check (&seed, writer, "ecd77b3fbf459591f24119d4118783fb");
-	check (&seed, writer, "9f10303495b58ccb715c893d40127e22");
+	check(writer, dist, rng, "a9e772602a2fd3135d940cfd727ab8ff");
+	check(writer, dist, rng, "b075369922e42b23e1852a586ec43224");
+	check(writer, dist, rng, "402395e76152db05b03c8f24ddfd7732");
 }