From 7c73ec405fdb55bd78d82d764999b5af6d81e973 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 13 Oct 2019 23:47:17 +0200 Subject: Fix failure to load OV after adding a VF to a project. This has the same cause as 19f51503621a57794bd79bac053c9e6549a69f46 i.e. the DCPDecoder re-use optimisation. This commit tries to re-fix 19f515 in a more general way which also takes into account the OV/VF bug. It also adds a unit test. --- src/lib/dcp_decoder.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/lib/dcp_decoder.h') diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 2e63b24a2..496d95740 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -58,6 +58,10 @@ public: bool pass (); void seek (dcpomatic::ContentTime t, bool accurate); + std::string lazy_digest () const { + return _lazy_digest; + } + private: friend struct dcp_subtitle_within_dcp_test; @@ -72,6 +76,7 @@ private: boost::shared_ptr decoder, dcp::Size size ); + std::string calculate_lazy_digest (boost::shared_ptr) const; /** Time of next thing to return from pass relative to the start of _reel */ dcpomatic::ContentTime _next; @@ -89,4 +94,6 @@ private: bool _decode_referenced; boost::optional _forced_reduction; + + std::string _lazy_digest; }; -- cgit v1.2.3