projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 51e272faa2379c778736a3cb984c862415f7c62e..178fd9002d18cff8b586790d5d14c473e796374b 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-32,10
+32,12
@@
#include <boost/enable_shared_from_this.hpp>
#include <boost/filesystem.hpp>
#include <dcp/key.h>
#include <boost/enable_shared_from_this.hpp>
#include <boost/filesystem.hpp>
#include <dcp/key.h>
-#include <dcp/kdm.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/encrypted_kdm.h>
#include "util.h"
#include "types.h"
#include "util.h"
#include "types.h"
-#include "dci_metadata.h"
+#include "isdcf_metadata.h"
+#include "frame_rate_change.h"
class DCPContentType;
class Log;
class DCPContentType;
class Log;
@@
-45,6
+47,7
@@
class Playlist;
class AudioContent;
class Scaler;
class Screen;
class AudioContent;
class Scaler;
class Screen;
+class isdcf_name_test;
/** @class Film
*
/** @class Film
*
@@
-63,7
+66,7
@@
public:
boost::filesystem::path info_path (int, Eyes) const;
boost::filesystem::path internal_video_mxf_dir () const;
boost::filesystem::path internal_video_mxf_filename () const;
boost::filesystem::path info_path (int, Eyes) const;
boost::filesystem::path internal_video_mxf_dir () const;
boost::filesystem::path internal_video_mxf_filename () const;
- boost::filesystem::path audio_analysis_
path (boost::shared_ptr<const AudioContent>
) const;
+ boost::filesystem::path audio_analysis_
dir (
) const;
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
@@
-83,11
+86,11
@@
public:
boost::filesystem::path file (boost::filesystem::path f) const;
boost::filesystem::path dir (boost::filesystem::path d) const;
boost::filesystem::path file (boost::filesystem::path f) const;
boost::filesystem::path dir (boost::filesystem::path d) const;
-
void
read_metadata ();
+
std::list<std::string>
read_metadata ();
void write_metadata () const;
boost::shared_ptr<xmlpp::Document> metadata () const;
void write_metadata () const;
boost::shared_ptr<xmlpp::Document> metadata () const;
- std::string
dci
_name (bool if_created_now) const;
+ std::string
isdcf
_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
/** @return true if our state has changed since we last saved it */
std::string dcp_name (bool if_created_now = false) const;
/** @return true if our state has changed since we last saved it */
@@
-96,18
+99,14
@@
public:
}
dcp::Size full_frame () const;
}
dcp::Size full_frame () const;
+ dcp::Size frame_size () const;
- std::
list<boost::filesystem::path> dcp
s () const;
+ std::
vector<CPLSummary> cpl
s () const;
boost::shared_ptr<Player> make_player () const;
boost::shared_ptr<Playlist> playlist () const;
boost::shared_ptr<Player> make_player () const;
boost::shared_ptr<Playlist> playlist () const;
- AudioFrame audio_frame_rate () const;
-
- AudioFrame time_to_audio_frames (DCPTime) const;
- VideoFrame time_to_video_frames (DCPTime) const;
- DCPTime video_frames_to_time (VideoFrame) const;
- DCPTime audio_frames_to_time (AudioFrame) const;
+ int audio_frame_rate () const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double &, double &) const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double &, double &) const;
@@
-116,23
+115,24
@@
public:
ContentList content () const;
DCPTime length () const;
ContentList content () const;
DCPTime length () const;
- bool has_subtitles () const;
- VideoFrame best_video_frame_rate () const;
+ int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
FrameRateChange active_frame_rate_change (DCPTime) const;
- dcp::KDM
+ dcp::
Encrypted
KDM
make_kdm (
boost::shared_ptr<dcp::Certificate> target,
make_kdm (
boost::shared_ptr<dcp::Certificate> target,
- boost::filesystem::path dcp,
- boost::posix_time::ptime from,
- boost::posix_time::ptime until
+ boost::filesystem::path cpl_file,
+ dcp::LocalTime from,
+ dcp::LocalTime until,
+ dcp::Formulation formulation
) const;
) const;
- std::list<dcp::KDM> make_kdms (
+ std::list<dcp::
Encrypted
KDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
std::list<boost::shared_ptr<Screen> >,
- boost::filesystem::path dcp,
- boost::posix_time::ptime from,
- boost::posix_time::ptime until
+ boost::filesystem::path cpl_file,
+ dcp::LocalTime from,
+ dcp::LocalTime until,
+ dcp::Formulation formulation
) const;
dcp::Key key () const {
) const;
dcp::Key key () const {
@@
-149,18
+149,17
@@
public:
enum Property {
NONE,
NAME,
enum Property {
NONE,
NAME,
- USE_
DCI
_NAME,
- /** The playlist's content list has changed (i.e. content has been added
, moved around
or removed) */
+ USE_
ISDCF
_NAME,
+ /** The playlist's content list has changed (i.e. content has been added or removed) */
CONTENT,
DCP_CONTENT_TYPE,
CONTAINER,
RESOLUTION,
SCALER,
CONTENT,
DCP_CONTENT_TYPE,
CONTAINER,
RESOLUTION,
SCALER,
- WITH_SUBTITLES,
SIGNED,
ENCRYPTED,
J2K_BANDWIDTH,
SIGNED,
ENCRYPTED,
J2K_BANDWIDTH,
-
DCI
_METADATA,
+
ISDCF
_METADATA,
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
/** The setting of _three_d has been changed */
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
/** The setting of _three_d has been changed */
@@
-180,8
+179,8
@@
public:
return _name;
}
return _name;
}
- bool use_
dci
_name () const {
- return _use_
dci
_name;
+ bool use_
isdcf
_name () const {
+ return _use_
isdcf
_name;
}
DCPContentType const * dcp_content_type () const {
}
DCPContentType const * dcp_content_type () const {
@@
-200,10
+199,6
@@
public:
return _scaler;
}
return _scaler;
}
- bool with_subtitles () const {
- return _with_subtitles;
- }
-
/* signed is a reserved word */
bool is_signed () const {
return _signed;
/* signed is a reserved word */
bool is_signed () const {
return _signed;
@@
-217,8
+212,8
@@
public:
return _j2k_bandwidth;
}
return _j2k_bandwidth;
}
-
DCIMetadata dci
_metadata () const {
- return _
dci
_metadata;
+
ISDCFMetadata isdcf
_metadata () const {
+ return _
isdcf
_metadata;
}
/** @return The frame rate of the DCP */
}
/** @return The frame rate of the DCP */
@@
-247,7
+242,7
@@
public:
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_directory (boost::filesystem::path);
void set_name (std::string);
- void set_use_
dci
_name (bool);
+ void set_use_
isdcf
_name (bool);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
@@
-257,15
+252,14
@@
public:
void set_container (Ratio const *);
void set_resolution (Resolution);
void set_scaler (Scaler const *);
void set_container (Ratio const *);
void set_resolution (Resolution);
void set_scaler (Scaler const *);
- void set_with_subtitles (bool);
void set_signed (bool);
void set_encrypted (bool);
void set_j2k_bandwidth (int);
void set_signed (bool);
void set_encrypted (bool);
void set_j2k_bandwidth (int);
- void set_
dci_metadata (DCI
Metadata);
+ void set_
isdcf_metadata (ISDCF
Metadata);
void set_video_frame_rate (int);
void set_audio_channels (int);
void set_three_d (bool);
void set_video_frame_rate (int);
void set_audio_channels (int);
void set_three_d (bool);
- void set_
dci
_date_today ();
+ void set_
isdcf
_date_today ();
void set_sequence_video (bool);
void set_interop (bool);
void set_sequence_video (bool);
void set_interop (bool);
@@
-280,6
+274,8
@@
public:
private:
private:
+ friend class ::isdcf_name_test;
+
void signal_changed (Property);
std::string video_identifier () const;
void playlist_changed ();
void signal_changed (Property);
std::string video_identifier () const;
void playlist_changed ();
@@
-298,8
+294,8
@@
private:
/** Name for DCP-o-matic */
std::string _name;
/** Name for DCP-o-matic */
std::string _name;
- /** True if a auto-generated
DCI
-compliant name should be used for our DCP */
- bool _use_
dci
_name;
+ /** True if a auto-generated
ISDCF
-compliant name should be used for our DCP */
+ bool _use_
isdcf
_name;
/** The type of content that this Film represents (feature, trailer etc.) */
DCPContentType const * _dcp_content_type;
/** The container to put this Film in (flat, scope, etc.) */
/** The type of content that this Film represents (feature, trailer etc.) */
DCPContentType const * _dcp_content_type;
/** The container to put this Film in (flat, scope, etc.) */
@@
-308,18
+304,16
@@
private:
Resolution _resolution;
/** Scaler algorithm to use */
Scaler const * _scaler;
Resolution _resolution;
/** Scaler algorithm to use */
Scaler const * _scaler;
- /** True if subtitles should be shown for this film */
- bool _with_subtitles;
bool _signed;
bool _encrypted;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
bool _signed;
bool _encrypted;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
- /**
DCI
naming stuff */
-
DCIMetadata _dci
_metadata;
+ /**
ISDCF
naming stuff */
+
ISDCFMetadata _isdcf
_metadata;
/** Frames per second to run our DCP at */
int _video_frame_rate;
/** Frames per second to run our DCP at */
int _video_frame_rate;
- /** The date that we should use in a
DCI
name */
- boost::gregorian::date _
dci
_date;
+ /** The date that we should use in a
ISDCF
name */
+ boost::gregorian::date _
isdcf
_date;
/** Number of audio channels to put in the DCP */
int _audio_channels;
/** If true, the DCP will be written in 3D mode; otherwise in 2D.
/** Number of audio channels to put in the DCP */
int _audio_channels;
/** If true, the DCP will be written in 3D mode; otherwise in 2D.