Fix subtitle_file() to find both Interop and SMPTE subtitles.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1059394731a9e21917683807f15ffbba64fe9e09..f1fd40fb791597c4bf5da7e960a05b523b5878cb 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -50,6 +50,7 @@
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
+#include <dcp/warnings.h>
 #include <asdcp/AS_DCP.h>
 #include <png.h>
 #include <sndfile.h>
@@ -59,8 +60,11 @@ extern "C" {
 }
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
-#include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
+LIBDCP_DISABLE_WARNINGS
+#include <boost/random.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
 #include <iostream>
 #include <list>
 #include <vector>
@@ -711,15 +715,13 @@ png_error_fn (png_structp, char const * message)
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 {
-       int png_color_type = 0;
+       int png_color_type = PNG_COLOR_TYPE_RGB;
        int bits_per_pixel = 0;
        switch (image->pixel_format()) {
        case AV_PIX_FMT_RGB24:
-               png_color_type = PNG_COLOR_TYPE_RGB;
                bits_per_pixel = 8;
                break;
        case AV_PIX_FMT_XYZ12LE:
-               png_color_type = PNG_COLOR_TYPE_RGB;
                bits_per_pixel = 16;
                break;
        default:
@@ -739,9 +741,40 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 
        png_set_IHDR (png_ptr, info_ptr, image->size().width, image->size().height, bits_per_pixel, png_color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
-       png_byte ** row_pointers = reinterpret_cast<png_byte **>(png_malloc(png_ptr, image->size().height * sizeof(png_byte *)));
-       for (int i = 0; i < image->size().height; ++i) {
-               row_pointers[i] = (png_byte *) (image->data()[0] + i * image->stride()[0]);
+       auto const width = image->size().width;
+       auto const height = image->size().height;
+       auto const stride = image->stride()[0];
+
+       vector<vector<uint8_t>> data_to_write(height);
+       for (int y = 0; y < height; ++y) {
+               data_to_write[y].resize(stride);
+       }
+
+       switch (image->pixel_format()) {
+       case AV_PIX_FMT_RGB24:
+               for (int y = 0; y < height; ++y) {
+                       memcpy(data_to_write[y].data(), image->data()[0] + y * stride, stride);
+               }
+               break;
+       case AV_PIX_FMT_XYZ12LE:
+               /* 16-bit pixel values must be written MSB first */
+               for (int y = 0; y < height; ++y) {
+                       data_to_write[y].resize(stride);
+                       uint8_t* original = image->data()[0] + y * stride;
+                       for (int x = 0; x < width * 3; ++x) {
+                               data_to_write[y][x * 2] = original[1];
+                               data_to_write[y][x * 2 + 1] = original[0];
+                               original += 2;
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+
+       png_byte ** row_pointers = reinterpret_cast<png_byte**>(png_malloc(png_ptr, image->size().height * sizeof(png_byte *)));
+       for (int y = 0; y < height; ++y) {
+               row_pointers[y] = reinterpret_cast<png_byte*>(data_to_write[y].data());
        }
 
        png_write_info (png_ptr, info_ptr);
@@ -803,13 +836,9 @@ dcp_file (shared_ptr<const Film> film, string prefix)
 boost::filesystem::path
 subtitle_file (shared_ptr<Film> film)
 {
-       for (auto i: boost::filesystem::directory_iterator(film->directory().get() / film->dcp_name (false))) {
-               if (boost::filesystem::is_directory(i.path())) {
-                       for (auto j: boost::filesystem::directory_iterator(i.path())) {
-                               if (boost::algorithm::starts_with(j.path().leaf().string(), "sub_")) {
-                                       return j.path();
-                               }
-                       }
+       for (auto i: boost::filesystem::recursive_directory_iterator(film->directory().get() / film->dcp_name(false))) {
+               if (boost::algorithm::starts_with(i.path().leaf().string(), "sub_")) {
+                       return i.path();
                }
        }
 
@@ -818,14 +847,21 @@ subtitle_file (shared_ptr<Film> film)
        return boost::filesystem::path("/");
 }
 
+
 void
 make_random_file (boost::filesystem::path path, size_t size)
 {
-       dcp::File t(path, "wb");
-       BOOST_REQUIRE (t);
-       for (size_t i = 0; i < size; ++i) {
-               uint8_t r = rand() & 0xff;
-               t.write(&r, 1, 1);
+       dcp::File random_file(path, "wb");
+       BOOST_REQUIRE (random_file);
+
+       boost::random::mt19937 rng(1);
+       boost::random::uniform_int_distribution<uint64_t> dist(0);
+
+       while (size > 0) {
+               auto this_time = std::min(size, size_t(8));
+               uint64_t random = dist(rng);
+               random_file.write(&random, this_time, 1);
+               size -= this_time;
        }
 }