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.h"
#include "openjpeg_image.h"
+#include <boost/random.hpp>
#include <boost/test/unit_test.hpp>
+#include <memory>
+
+using std::make_shared;
+using std::shared_ptr;
using std::string;
-using boost::shared_ptr;
+
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::Data 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().get(), 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)
{
- shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
- shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/frame_info_hash_test.mxf", false);
+ 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", dcp::PictureAsset::Behaviour::MAKE_NEW);
- 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, "c039c5a0e5d20bc646f7e9c10e2d5874");
- check (&seed, writer, "d9e694cfe84544c54a869c128ba39343");
- check (&seed, writer, "fafb05a0039cb9fc604279c90a13cb87");
+ check(writer, dist, rng, "a9e772602a2fd3135d940cfd727ab8ff");
+ check(writer, dist, rng, "b075369922e42b23e1852a586ec43224");
+ check(writer, dist, rng, "402395e76152db05b03c8f24ddfd7732");
}