projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix up paths for video MXFs, hashes and temporarily-stored frames.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 3485dfaae8dd1eec33e7f9cb6527daf963390d04..4d2819be30c9226bd67d0cbc8f44d1293a87b907 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-59,7
+59,10
@@
public:
Film (Film const &);
~Film ();
Film (Film const &);
~Film ();
- std::string j2k_dir () const;
+ std::string hash_dir () const;
+ std::string j2c_path (int f, bool t) const;
+ std::string hash_path (int f) const;
+ std::string video_mxf_path () const;
void examine_content ();
void send_dcp_to_tms ();
void examine_content ();
void send_dcp_to_tms ();
@@
-86,11
+89,14
@@
public:
void write_metadata () const;
void read_metadata ();
void write_metadata () const;
void read_metadata ();
- Size cropped_size (Size) const;
- boost::optional<int> dcp_length () const;
+ libdcp::Size cropped_size (libdcp::Size) const;
std::string dci_name () const;
std::string dcp_name () const;
std::string dci_name () const;
std::string dcp_name () const;
+ boost::optional<int> dcp_intrinsic_duration () const {
+ return _dcp_intrinsic_duration;
+ }
+
/** @return true if our state has changed since we last saved it */
bool dirty () const {
return _dirty;
/** @return true if our state has changed since we last saved it */
bool dirty () const {
return _dirty;
@@
-114,9
+120,8
@@
public:
CROP,
FILTERS,
SCALER,
CROP,
FILTERS,
SCALER,
- DCP_TRIM_START,
- DCP_TRIM_END,
- REEL_SIZE,
+ TRIM_START,
+ TRIM_END,
DCP_AB,
CONTENT_AUDIO_STREAM,
EXTERNAL_AUDIO,
DCP_AB,
CONTENT_AUDIO_STREAM,
EXTERNAL_AUDIO,
@@
-133,6
+138,7
@@
public:
DCI_METADATA,
SIZE,
LENGTH,
DCI_METADATA,
SIZE,
LENGTH,
+ DCP_INTRINSIC_DURATION,
CONTENT_AUDIO_STREAMS,
SUBTITLE_STREAMS,
FRAMES_PER_SECOND,
CONTENT_AUDIO_STREAMS,
SUBTITLE_STREAMS,
FRAMES_PER_SECOND,
@@
-191,21
+197,16
@@
public:
return _scaler;
}
return _scaler;
}
-
SourceFrame dcp_
trim_start () const {
+
int
trim_start () const {
boost::mutex::scoped_lock lm (_state_mutex);
boost::mutex::scoped_lock lm (_state_mutex);
- return _
dcp_
trim_start;
+ return _trim_start;
}
}
-
SourceFrame dcp_
trim_end () const {
+
int
trim_end () const {
boost::mutex::scoped_lock lm (_state_mutex);
boost::mutex::scoped_lock lm (_state_mutex);
- return _
dcp_
trim_end;
+ return _trim_end;
}
}
- boost::optional<uint64_t> reel_size () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _reel_size;
- }
-
bool dcp_ab () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _dcp_ab;
bool dcp_ab () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _dcp_ab;
@@
-241,6
+242,8
@@
public:
return _still_duration;
}
return _still_duration;
}
+ int still_duration_in_frames () const;
+
boost::shared_ptr<SubtitleStream> subtitle_stream () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _subtitle_stream;
boost::shared_ptr<SubtitleStream> subtitle_stream () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _subtitle_stream;
@@
-306,7
+309,7
@@
public:
return _package_type;
}
return _package_type;
}
- Size size () const {
+
libdcp::
Size size () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _size;
}
boost::mutex::scoped_lock lm (_state_mutex);
return _size;
}
@@
-359,10
+362,8
@@
public:
void set_bottom_crop (int);
void set_filters (std::vector<Filter const *>);
void set_scaler (Scaler const *);
void set_bottom_crop (int);
void set_filters (std::vector<Filter const *>);
void set_scaler (Scaler const *);
- void set_dcp_trim_start (int);
- void set_dcp_trim_end (int);
- void set_reel_size (uint64_t);
- void unset_reel_size ();
+ void set_trim_start (int);
+ void set_trim_end (int);
void set_dcp_ab (bool);
void set_content_audio_stream (boost::shared_ptr<AudioStream>);
void set_external_audio (std::vector<std::string>);
void set_dcp_ab (bool);
void set_content_audio_stream (boost::shared_ptr<AudioStream>);
void set_external_audio (std::vector<std::string>);
@@
-383,9
+384,10
@@
public:
void set_studio (std::string);
void set_facility (std::string);
void set_package_type (std::string);
void set_studio (std::string);
void set_facility (std::string);
void set_package_type (std::string);
- void set_size (Size);
+ void set_size (
libdcp::
Size);
void set_length (SourceFrame);
void unset_length ();
void set_length (SourceFrame);
void unset_length ();
+ void set_dcp_intrinsic_duration (int);
void set_content_digest (std::string);
void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
void set_content_digest (std::string);
void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
@@
-410,6
+412,7
@@
private:
void signal_changed (Property);
void examine_content_finished ();
void signal_changed (Property);
void examine_content_finished ();
+ std::string video_state_identifier () const;
/** Complete path to directory containing the film metadata;
* must not be relative.
/** Complete path to directory containing the film metadata;
* must not be relative.
@@
-442,11
+445,9
@@
private:
/** Scaler algorithm to use */
Scaler const * _scaler;
/** Frames to trim off the start of the DCP */
/** Scaler algorithm to use */
Scaler const * _scaler;
/** Frames to trim off the start of the DCP */
- int _
dcp_
trim_start;
+ int _trim_start;
/** Frames to trim off the end of the DCP */
/** Frames to trim off the end of the DCP */
- int _dcp_trim_end;
- /** Approximate target reel size in bytes; if not set, use a single reel */
- boost::optional<uint64_t> _reel_size;
+ int _trim_end;
/** true to create an A/B comparison DCP, where the left half of the image
is the video without any filters or post-processing, and the right half
has the specified filters and post-processing.
/** true to create an A/B comparison DCP, where the left half of the image
is the video without any filters or post-processing, and the right half
has the specified filters and post-processing.
@@
-495,9
+496,10
@@
private:
/* Data which are cached to speed things up */
/** Size, in pixels, of the source (ignoring cropping) */
/* Data which are cached to speed things up */
/** Size, in pixels, of the source (ignoring cropping) */
- Size _size;
+
libdcp::
Size _size;
/** The length of the source, in video frames (as far as we know) */
boost::optional<SourceFrame> _length;
/** The length of the source, in video frames (as far as we know) */
boost::optional<SourceFrame> _length;
+ boost::optional<int> _dcp_intrinsic_duration;
/** MD5 digest of our content file */
std::string _content_digest;
/** The audio streams in our content */
/** MD5 digest of our content file */
std::string _content_digest;
/** The audio streams in our content */