Whitespace.

[libdcp.git] / test / frame_info_hash_test.cc

diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 8e894d29e660d5cc5aebb2f4bed6b06f3e86b4b5..82e0f3ac0bd12246d950f383dfc8b44e737fc0f8 100644 (file)
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,16 +15,31 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include "openjpeg_image.h"
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 
 static void
 check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string hash)
@@ -36,22 +51,22 @@ check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string ha
                }
        }
 
-       dcp::Data data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
+       dcp::ArrayData data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
 
-       dcp::FrameInfo info = writer->write (data.data().get(), data.size());
+       dcp::FrameInfo 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", false);
 
        unsigned int seed = 42;
 
        /* Check a few random frames */
-       check (&seed, writer, "c039c5a0e5d20bc646f7e9c10e2d5874");
-       check (&seed, writer, "d9e694cfe84544c54a869c128ba39343");
-       check (&seed, writer, "fafb05a0039cb9fc604279c90a13cb87");
+       check (&seed, writer, "9da3d1d93a80683e65d996edae4101ed");
+       check (&seed, writer, "ecd77b3fbf459591f24119d4118783fb");
+       check (&seed, writer, "9f10303495b58ccb715c893d40127e22");
 }