Fix failure to examine non-flat-ratio VFs (#2775).

diff --git a/src/lib/audio_examiner.h b/src/lib/audio_examiner.h
index f18387041ada09c709cf8d36e7ff9ab8e7aaeb44..8f5646d0f2741af648019c29be61ea0109fa61d6 100644 (file)
--- a/src/lib/audio_examiner.h
+++ b/src/lib/audio_examiner.h
@@ -21,6 +21,10 @@
 #ifndef DCPOMATIC_AUDIO_EXAMINER_H
 #define DCPOMATIC_AUDIO_EXAMINER_H
 
+
+#include "types.h"
+
+
 /** @file  src/lib/audio_examiner.h
  *  @brief AudioExaminer class.
  */

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 72eb828605abe30221077532ab7d7b9dea28aaa5..88c9a5b700a64e279c5b459610c29f70955ec1d3 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -145,8 +145,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        if (!reel->main_picture()->asset_ref().resolved()) {
                                LOG_GENERAL("Main picture %1 of reel %2 is missing", reel->main_picture()->id(), reel->id());
                                _needs_assets = true;
-                               /* Use a dummy value here; it will be replaced when the VF is re-examined. */
-                               _video_size = dcp::Size(1998, 1080);
                        } else {
                                LOG_GENERAL("Main picture %1 of reel %2 found", reel->main_picture()->id(), reel->id());
 

diff --git a/test/dcp_examiner_test.cc b/test/dcp_examiner_test.cc
new file mode 100644 (file)
index 0000000..cdd6b20
--- /dev/null
+++ b/test/dcp_examiner_test.cc
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2024 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_examiner.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "test.h"
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
+
+
+BOOST_AUTO_TEST_CASE(check_examine_vfs)
+{
+       auto image = content_factory("test/data/scope_red.png")[0];
+       auto ov = new_test_film2("check_examine_vfs_ov", { image });
+       ov->set_container(Ratio::from_id("239"));
+       make_and_verify_dcp(ov);
+
+       auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
+       auto second_reel = content_factory("test/data/scope_red.png")[0];
+       auto vf = new_test_film2("check_examine_vf_vf", { ov_dcp, second_reel });
+       vf->set_container(Ratio::from_id("239"));
+       vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+       ov_dcp->set_reference_video(true);
+       make_and_verify_dcp(vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET });
+
+       auto vf_dcp = make_shared<DCPContent>(vf->dir(vf->dcp_name()));
+       DCPExaminer examiner(vf_dcp, false);
+}
+

diff --git a/test/wscript b/test/wscript
index a98f15d5bb832f694caed54b613c8a4a221a0307..bb66d1a5f952ff07d115ac63c9d647e6346829a6 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -73,6 +73,7 @@ def build(bld):
                  dcpomatic_time_test.cc
                  dcp_decoder_test.cc
                  dcp_digest_file_test.cc
+                 dcp_examiner_test.cc
                  dcp_metadata_test.cc
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc