/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
class Playlist;
class AudioContent;
class AudioProcessor;
-class AudioMapping;
class Ratio;
class Job;
-class ScreenKDM;
class Film;
struct isdcf_name_test;
+struct recover_test_2d_encrypted;
class InfoFileHandle
{
/** @class Film
*
- * @brief A representation of some audio and video content, and details of
- * how they should be presented in a DCP.
+ * @brief A representation of some audio, video, subtitle and closed-caption content,
+ * and details of how they should be presented in a DCP.
*
* The content of a Film is held in a Playlist (created and managed by the Film).
*/
boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
+ boost::filesystem::path subtitle_analysis_path (boost::shared_ptr<const Content>) const;
void send_dcp_to_tms ();
void make_dcp (bool gui = false, bool check = true);
boost::optional<int> disable_forensic_marking_audio
) const;
- std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
- std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
- boost::filesystem::path cpl_file,
- boost::posix_time::ptime from,
- boost::posix_time::ptime until,
- dcp::Formulation formulation,
- bool disable_forensic_marking_picture,
- boost::optional<int> disable_forensic_marking_audio
- ) const;
-
int state_version () const {
return _state_version;
}
DCP_CONTENT_TYPE,
CONTAINER,
RESOLUTION,
- SIGNED,
ENCRYPTED,
- KEY,
J2K_BANDWIDTH,
ISDCF_METADATA,
VIDEO_FRAME_RATE,
AUDIO_PROCESSOR,
REEL_TYPE,
REEL_LENGTH,
- UPLOAD_AFTER_MAKE_DCP,
REENCODE_J2K,
MARKERS,
RATINGS,
return _resolution;
}
- /* signed is a reserved word */
- bool is_signed () const {
- return _signed;
- }
-
bool encrypted () const {
return _encrypted;
}
return _reel_length;
}
- bool upload_after_make_dcp () const {
- return _upload_after_make_dcp;
- }
-
std::string context_id () const {
return _context_id;
}
void move_content_earlier (boost::shared_ptr<Content>);
void move_content_later (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
- void set_container (Ratio const *);
- void set_resolution (Resolution);
- void set_signed (bool);
+ void set_container (Ratio const *, bool user_explicit = true);
+ void set_resolution (Resolution, bool user_explicit = true);
void set_encrypted (bool);
- void set_key (dcp::Key key);
void set_j2k_bandwidth (int);
void set_isdcf_metadata (ISDCFMetadata);
void set_video_frame_rate (int rate, bool user_explicit = false);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
void set_reel_length (int64_t);
- void set_upload_after_make_dcp (bool);
void set_reencode_j2k (bool);
void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
void unset_marker (dcp::Marker type);
+ void clear_markers ();
void set_ratings (std::vector<dcp::Rating> r);
void set_content_version (std::string v);
private:
friend struct ::isdcf_name_test;
+ friend struct ::recover_test_2d_encrypted;
template <typename> friend class ChangeSignaller;
boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
void audio_analysis_finished ();
void check_settings_consistency ();
+ void maybe_set_container_and_resolution ();
static std::string const metadata_file;
Ratio const * _container;
/** DCP resolution (2K or 4K) */
Resolution _resolution;
- bool _signed;
bool _encrypted;
dcp::Key _key;
/** context ID used when encrypting picture assets; we keep it so that we can
ReelType _reel_type;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
- bool _upload_after_make_dcp;
bool _reencode_j2k;
/** true if the user has ever explicitly set the video frame rate of this film */
bool _user_explicit_video_frame_rate;
+ bool _user_explicit_container;
+ bool _user_explicit_resolution;
std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
std::vector<dcp::Rating> _ratings;
std::string _content_version;