projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimise decoder_factory for DCPDecoder by offering the old decoder
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index d3c5c57eddc368ba65f68c77b37713bf1f52fffb..f31d28053c3b3fc987190585fab451633a6ffa38 100644
(file)
--- a/
src/lib/dcp_decoder.h
+++ b/
src/lib/dcp_decoder.h
@@
-40,7
+40,12
@@
struct dcp_subtitle_within_dcp_test;
class DCPDecoder : public DCP, public Decoder
{
public:
class DCPDecoder : public DCP, public Decoder
{
public:
- DCPDecoder (boost::shared_ptr<const DCPContent>, bool fast);
+ DCPDecoder (
+ boost::shared_ptr<const Film> film,
+ boost::shared_ptr<const DCPContent>,
+ bool fast,
+ boost::shared_ptr<DCPDecoder> old = boost::shared_ptr<DCPDecoder>()
+ );
std::list<boost::shared_ptr<dcp::Reel> > reels () const {
return _reels;
std::list<boost::shared_ptr<dcp::Reel> > reels () const {
return _reels;
@@
-49,18
+54,17
@@
public:
void set_decode_referenced (bool r);
void set_forced_reduction (boost::optional<int> reduction);
void set_decode_referenced (bool r);
void set_forced_reduction (boost::optional<int> reduction);
- bool pass (
boost::shared_ptr<const Film> film
);
- void seek (
boost::shared_ptr<const Film> film,
ContentTime t, bool accurate);
+ bool pass ();
+ void seek (
dcpomatic::
ContentTime t, bool accurate);
private:
friend struct dcp_subtitle_within_dcp_test;
void next_reel ();
void get_readers ();
private:
friend struct dcp_subtitle_within_dcp_test;
void next_reel ();
void get_readers ();
- void pass_texts (
boost::shared_ptr<const Film> film,
ContentTime next, dcp::Size size);
+ void pass_texts (
dcpomatic::
ContentTime next, dcp::Size size);
void pass_texts (
void pass_texts (
- boost::shared_ptr<const Film> film,
- ContentTime next,
+ dcpomatic::ContentTime next,
boost::shared_ptr<dcp::SubtitleAsset> asset,
bool reference,
int64_t entry_point,
boost::shared_ptr<dcp::SubtitleAsset> asset,
bool reference,
int64_t entry_point,
@@
-69,7
+73,7
@@
private:
);
/** Time of next thing to return from pass relative to the start of _reel */
);
/** Time of next thing to return from pass relative to the start of _reel */
- ContentTime _next;
+
dcpomatic::
ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;