Cleanup: use some more make_shared.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 6b2e584a200af4bec0f4c70b30ec2d9dfdef9328..9260d568facce6a738b78f22bb182e18f4c5cd11 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -369,6 +369,8 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check)
        FFmpegImageProxy check_proxy (check);
        auto check_image = check_proxy.image(Image::Alignment::COMPACT).image;
 
+       BOOST_REQUIRE_EQUAL (ref_image->planes(), check_image->planes());
+
        BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format());
        auto const format = ref_image->pixel_format();
 
@@ -417,6 +419,19 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check)
                        }
                        break;
                }
+               case AV_PIX_FMT_YUVJ420P:
+               {
+                       for (int c = 0; c < ref_image->planes(); ++c) {
+                               for (int y = 0; y < height / ref_image->vertical_factor(c); ++y) {
+                                       auto p = ref_image->data()[c] + y * ref_image->stride()[c];
+                                       auto q = check_image->data()[c] + y * check_image->stride()[c];
+                                       for (int x = 0; x < ref_image->line_size()[c]; ++x) {
+                                               sum_square += pow((*p++ - *q++), 2);
+                                       }
+                               }
+                       }
+                       break;
+               }
                default:
                        BOOST_REQUIRE_MESSAGE (false, "unrecognised pixel format " << format);
        }
@@ -447,46 +462,40 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
        auto N = boost::filesystem::file_size (ref);
        BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
-       auto ref_file = fopen_boost (ref, "rb");
+       dcp::File ref_file(ref, "rb");
        BOOST_CHECK (ref_file);
-       auto check_file = fopen_boost (check, "rb");
+       dcp::File check_file(check, "rb");
        BOOST_CHECK (check_file);
 
        int const buffer_size = 65536;
-       uint8_t* ref_buffer = new uint8_t[buffer_size];
-       uint8_t* check_buffer = new uint8_t[buffer_size];
+       std::vector<uint8_t> ref_buffer(buffer_size);
+       std::vector<uint8_t> check_buffer(buffer_size);
 
        string error = "File " + check.string() + " differs from reference " + ref.string();
 
        while (N) {
                uintmax_t this_time = min (uintmax_t (buffer_size), N);
-               size_t r = fread (ref_buffer, 1, this_time, ref_file);
+               size_t r = ref_file.read (ref_buffer.data(), 1, this_time);
                BOOST_CHECK_EQUAL (r, this_time);
-               r = fread (check_buffer, 1, this_time, check_file);
+               r = check_file.read(check_buffer.data(), 1, this_time);
                BOOST_CHECK_EQUAL (r, this_time);
 
-               BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
-               if (memcmp (ref_buffer, check_buffer, this_time)) {
+               BOOST_CHECK_MESSAGE (memcmp (ref_buffer.data(), check_buffer.data(), this_time) == 0, error);
+               if (memcmp (ref_buffer.data(), check_buffer.data(), this_time)) {
                        break;
                }
 
                N -= this_time;
        }
-
-       delete[] ref_buffer;
-       delete[] check_buffer;
-
-       fclose (ref_file);
-       fclose (check_file);
 }
 
 
 void
 check_text_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
-       auto ref_file = fopen_boost (ref, "r");
+       dcp::File ref_file(ref, "r");
        BOOST_CHECK (ref_file);
-       auto check_file = fopen_boost (check, "r");
+       dcp::File check_file(check, "r");
        BOOST_CHECK (check_file);
 
        int const buffer_size = std::max(
@@ -496,20 +505,14 @@ check_text_file (boost::filesystem::path ref, boost::filesystem::path check)
 
        DCPOMATIC_ASSERT (buffer_size < 1024 * 1024);
 
-       auto ref_buffer = new uint8_t[buffer_size];
-       auto ref_read = fread(ref_buffer, 1, buffer_size, ref_file);
-       auto check_buffer = new uint8_t[buffer_size];
-       auto check_read = fread(check_buffer, 1, buffer_size, check_file);
+       std::vector<uint8_t> ref_buffer(buffer_size);
+       auto ref_read = ref_file.read(ref_buffer.data(), 1, buffer_size);
+       std::vector<uint8_t> check_buffer(buffer_size);
+       auto check_read = check_file.read(check_buffer.data(), 1, buffer_size);
        BOOST_CHECK_EQUAL (ref_read, check_read);
 
        string const error = "File " + check.string() + " differs from reference " + ref.string();
-       BOOST_CHECK_MESSAGE(memcmp(ref_buffer, check_buffer, ref_read) == 0, error);
-
-       delete[] ref_buffer;
-       delete[] check_buffer;
-
-       fclose (ref_file);
-       fclose (check_file);
+       BOOST_CHECK_MESSAGE(memcmp(ref_buffer.data(), check_buffer.data(), ref_read) == 0, error);
 }
 
 
@@ -818,13 +821,12 @@ subtitle_file (shared_ptr<Film> film)
 void
 make_random_file (boost::filesystem::path path, size_t size)
 {
-       auto t = fopen_boost(path, "wb");
+       dcp::File t(path, "wb");
        BOOST_REQUIRE (t);
        for (size_t i = 0; i < size; ++i) {
                uint8_t r = rand() & 0xff;
-               fwrite (&r, 1, 1, t);
+               t.write(&r, 1, 1);
        }
-       fclose (t);
 }
 
 
@@ -928,3 +930,17 @@ ConfigRestorer::~ConfigRestorer()
        setup_test_config();
 }
 
+
+boost::filesystem::path
+find_file (boost::filesystem::path dir, string filename_part)
+{
+       boost::optional<boost::filesystem::path> found;
+       for (auto i: boost::filesystem::directory_iterator(dir)) {
+               if (i.path().filename().string().find(filename_part) != string::npos) {
+                       BOOST_REQUIRE (!found);
+                       found = i;
+               }
+       }
+       BOOST_REQUIRE (found);
+       return *found;
+}