summaryrefslogtreecommitdiff
path: root/src/lib/dcp_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-13 23:47:17 +0200
committerCarl Hetherington <cth@carlh.net>2019-10-13 23:47:17 +0200
commit7c73ec405fdb55bd78d82d764999b5af6d81e973 (patch)
treeb32fca5e5881e14ed86dc9c8e612d228cef2fcf0 /src/lib/dcp_decoder.h
parent89ec77ff82b231445f2c5a4cf50d86e6cd910332 (diff)
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.
Diffstat (limited to 'src/lib/dcp_decoder.h')
-rw-r--r--src/lib/dcp_decoder.h7
1 files changed, 7 insertions, 0 deletions
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<TextDecoder> decoder,
dcp::Size size
);
+ std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) 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<int> _forced_reduction;
+
+ std::string _lazy_digest;
};