* how they should be presented in a DCP.
*/
-#ifndef DVDOMATIC_FILM_H
-#define DVDOMATIC_FILM_H
+#ifndef DCPOMATIC_FILM_H
+#define DCPOMATIC_FILM_H
#include <string>
#include <vector>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/enable_shared_from_this.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
-#include "dcp_content_type.h"
#include "util.h"
#include "dci_metadata.h"
#include "types.h"
+#include "ffmpeg_content.h"
+#include "playlist.h"
+class DCPContentType;
class Format;
class Job;
class Filter;
class ExternalAudioStream;
class Content;
class Player;
-class Playlist;
/** @class Film
* @brief A representation of some audio and video content, and details of
std::string info_dir () const;
std::string j2c_path (int f, bool t) const;
std::string info_path (int f) const;
- std::string video_mxf_dir () const;
- std::string video_mxf_filename () const;
+ std::string internal_video_mxf_dir () const;
+ std::string internal_video_mxf_filename () const;
std::string audio_analysis_path () const;
void examine_content (boost::shared_ptr<Content>);
+ std::string dcp_video_mxf_filename () const;
+ std::string dcp_audio_mxf_filename () const;
+
void analyse_audio ();
void send_dcp_to_tms ();
void make_dcp ();
std::string file (std::string f) const;
std::string dir (std::string d) const;
- int target_audio_sample_rate () const;
-
void write_metadata () const;
libdcp::Size cropped_size (libdcp::Size) const;
bool have_dcp () const;
boost::shared_ptr<Player> player () const;
+ boost::shared_ptr<Playlist> playlist () const;
+
+ OutputAudioFrame dcp_audio_frame_rate () const;
+
+ OutputAudioFrame time_to_audio_frames (Time) const;
+ OutputVideoFrame time_to_video_frames (Time) const;
+ Time video_frames_to_time (OutputVideoFrame) const;
+ Time audio_frames_to_time (OutputAudioFrame) const;
/* Proxies for some Playlist methods */
- ContentAudioFrame audio_length () const;
- int audio_channels () const;
- int audio_frame_rate () const;
- int64_t audio_channel_layout () const;
- bool has_audio () const;
-
- float video_frame_rate () const;
- libdcp::Size video_size () const;
- ContentVideoFrame video_length () const;
+ Playlist::RegionList regions () const;
+
+ Time length () const;
+ bool has_subtitles () const;
+ OutputVideoFrame best_dcp_video_frame_rate () const;
+
+ void set_loop (int);
+ int loop () const;
+
+ enum TrimType {
+ CPL,
+ ENCODE
+ };
/** Identifiers for the parts of our state;
used for signalling changes.
NAME,
USE_DCI_NAME,
TRUST_CONTENT_HEADERS,
- /** The content list has changed (i.e. content has been added, moved around or removed) */
+ /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
CONTENT,
+ LOOP,
DCP_CONTENT_TYPE,
FORMAT,
CROP,
TRIM_START,
TRIM_END,
AB,
+ TRIM_TYPE,
AUDIO_GAIN,
AUDIO_DELAY,
- SUBTITLE_STREAM,
WITH_SUBTITLES,
SUBTITLE_OFFSET,
SUBTITLE_SCALE,
COLOUR_LUT,
J2K_BANDWIDTH,
DCI_METADATA,
- DCP_FRAME_RATE
+ DCP_VIDEO_FRAME_RATE,
};
return _trust_content_headers;
}
- ContentList content () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _content;
- }
-
DCPContentType const * dcp_content_type () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _dcp_content_type;
return _trim_end;
}
+ TrimType trim_type () const {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _trim_type;
+ }
+
bool ab () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _ab;
return _dci_metadata;
}
- int dcp_frame_rate () const {
+ /* XXX: -> "video_frame_rate" */
+ int dcp_video_frame_rate () const {
boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_frame_rate;
+ return _dcp_video_frame_rate;
}
/* SET */
void set_trust_content_headers (bool);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
- 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_format (Format const *);
void set_crop (Crop);
void set_trim_start (int);
void set_trim_end (int);
void set_ab (bool);
+ void set_trim_type (TrimType);
void set_audio_gain (float);
void set_audio_delay (int);
void set_with_subtitles (bool);
void set_colour_lut (int);
void set_j2k_bandwidth (int);
void set_dci_metadata (DCIMetadata);
- void set_dcp_frame_rate (int);
+ void set_dcp_video_frame_rate (int);
void set_dci_date_today ();
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property of our content has changed */
- mutable boost::signals2::signal<void (int)> ContentChanged;
+ mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
boost::signals2::signal<void ()> AudioAnalysisSucceeded;
void analyse_audio_finished ();
std::string video_state_identifier () const;
void read_metadata ();
- void content_changed (int);
+ void playlist_changed ();
+ void playlist_content_changed (boost::weak_ptr<Content>, int);
+ std::string filename_safe_name () const;
/** Log to write to */
boost::shared_ptr<Log> _log;
/** Mutex for _directory */
mutable boost::mutex _directory_mutex;
- /** Name for DVD-o-matic */
+ /** 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;
bool _trust_content_headers;
- ContentList _content;
- std::list<boost::signals2::connection> _content_connections;
/** The type of content that this Film represents (feature, trailer etc.) */
DCPContentType const * _dcp_content_type;
/** The format to present this Film in (flat, scope, etc.) */
int _trim_start;
/** Frames to trim off the end of the DCP */
int _trim_end;
+ TrimType _trim_type;
/** 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.
/** DCI naming stuff */
DCIMetadata _dci_metadata;
/** Frames per second to run our DCP at */
- int _dcp_frame_rate;
+ int _dcp_video_frame_rate;
/** The date that we should use in a DCI name */
boost::gregorian::date _dci_date;
projects / dcpomatic.git / blobdiff