projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix DCP playback when an incorrect KDM is added, followed by
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.cc
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index a3c42a321a70d824ca8d6a84497dfcec804595c9..ab724cd6c75bbb7a5f02326e15b92f3a964a0322 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-29,6
+29,7
@@
#include "image.h"
#include "config.h"
#include "digester.h"
#include "image.h"
#include "config.h"
#include "digester.h"
+#include "frame_interval_checker.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
@@
-450,10
+451,18
@@
DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
d.add (i.string());
}
BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
d.add (i.string());
}
- d.add (static_cast<bool>(_dcp_content->kdm()));
+ if (_dcp_content->kdm()) {
+ d.add(_dcp_content->kdm()->id());
+ }
d.add (static_cast<bool>(c->cpl()));
if (c->cpl()) {
d.add (c->cpl().get());
}
return d.get ();
}
d.add (static_cast<bool>(c->cpl()));
if (c->cpl()) {
d.add (c->cpl().get());
}
return d.get ();
}
+
+ContentTime
+DCPDecoder::position () const
+{
+ return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
+}