projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add defaults for facility, studio, chain, distributor (#2075).
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index 1abe39a27d7e56bf74bb8a58be4ec557f7b7d301..a4dfbad4e5304f55d07ce2ff809b719708be162a 100644
(file)
--- a/
src/lib/dcp_decoder.h
+++ b/
src/lib/dcp_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-202
1
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,10
+18,12
@@
*/
*/
+
/** @file src/dcp_decoder.h
* @brief A decoder of existing DCPs.
*/
/** @file src/dcp_decoder.h
* @brief A decoder of existing DCPs.
*/
+
#include "atmos_metadata.h"
#include "decoder.h"
#include "dcp.h"
#include "atmos_metadata.h"
#include "decoder.h"
#include "dcp.h"
@@
-30,6
+32,7
@@
#include <dcp/sound_asset_reader.h>
#include <dcp/subtitle_asset.h>
#include <dcp/sound_asset_reader.h>
#include <dcp/subtitle_asset.h>
+
namespace dcp {
class Reel;
}
namespace dcp {
class Reel;
}
@@
-38,32
+41,35
@@
class DCPContent;
class Log;
struct dcp_subtitle_within_dcp_test;
class Log;
struct dcp_subtitle_within_dcp_test;
+
class DCPDecoder : public DCP, public Decoder
{
public:
DCPDecoder (
class DCPDecoder : public DCP, public Decoder
{
public:
DCPDecoder (
-
boost
::shared_ptr<const Film> film,
-
boost
::shared_ptr<const DCPContent>,
+
std
::shared_ptr<const Film> film,
+
std
::shared_ptr<const DCPContent>,
bool fast,
bool tolerant,
bool fast,
bool tolerant,
-
boost
::shared_ptr<DCPDecoder> old
+
std
::shared_ptr<DCPDecoder> old
);
);
- std::
list<boost::shared_ptr<dcp::Reel>
> reels () const {
+ std::
vector<std::shared_ptr<dcp::Reel>
> reels () const {
return _reels;
}
void set_decode_referenced (bool r);
void set_forced_reduction (boost::optional<int> reduction);
return _reels;
}
void set_decode_referenced (bool r);
void set_forced_reduction (boost::optional<int> reduction);
- bool pass ();
- void seek (dcpomatic::ContentTime t, bool accurate);
+ bool pass () override;
+ void seek (dcpomatic::ContentTime t, bool accurate) override;
+
+ std::vector<dcpomatic::FontData> fonts () const override;
std::string lazy_digest () const {
return _lazy_digest;
}
std::string lazy_digest () const {
return _lazy_digest;
}
- dcpomatic::ContentTime position () const;
+ dcpomatic::ContentTime position () const
override
;
private:
friend struct dcp_subtitle_within_dcp_test;
private:
friend struct dcp_subtitle_within_dcp_test;
@@
-73,31
+79,31
@@
private:
void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
void pass_texts (
dcpomatic::ContentTime next,
void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
void pass_texts (
dcpomatic::ContentTime next,
-
boost
::shared_ptr<dcp::SubtitleAsset> asset,
+
std
::shared_ptr<dcp::SubtitleAsset> asset,
bool reference,
int64_t entry_point,
bool reference,
int64_t entry_point,
-
boost
::shared_ptr<TextDecoder> decoder,
+
std
::shared_ptr<TextDecoder> decoder,
dcp::Size size
);
dcp::Size size
);
- std::string calculate_lazy_digest (
boost
::shared_ptr<const DCPContent>) const;
+ std::string calculate_lazy_digest (
std
::shared_ptr<const DCPContent>) const;
/** Time of next thing to return from pass relative to the start of _reel */
dcpomatic::ContentTime _next;
/** Time of next thing to return from pass relative to the start of _reel */
dcpomatic::ContentTime _next;
- std::
list<boost::shared_ptr<dcp::Reel>
> _reels;
+ std::
vector<std::shared_ptr<dcp::Reel>
> _reels;
- std::
list<boost::shared_ptr<dcp::Reel>
>::iterator _reel;
+ std::
vector<std::shared_ptr<dcp::Reel>
>::iterator _reel;
/** Offset of _reel from the start of the content in frames */
/** Offset of _reel from the start of the content in frames */
- int64_t _offset;
+ int64_t _offset
= 0
;
/** Reader for current mono picture asset, if applicable */
/** Reader for current mono picture asset, if applicable */
-
boost
::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+
std
::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
/** Reader for current stereo picture asset, if applicable */
/** Reader for current stereo picture asset, if applicable */
-
boost
::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+
std
::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
/** Reader for current sound asset, if applicable */
/** Reader for current sound asset, if applicable */
-
boost
::shared_ptr<dcp::SoundAssetReader> _sound_reader;
-
boost
::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
+
std
::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+
std
::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
boost::optional<AtmosMetadata> _atmos_metadata;
boost::optional<AtmosMetadata> _atmos_metadata;
- bool _decode_referenced;
+ bool _decode_referenced
= false
;
boost::optional<int> _forced_reduction;
std::string _lazy_digest;
boost::optional<int> _forced_reduction;
std::string _lazy_digest;