* 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 "audio_mapping.h"
+class DCPContentType;
class Format;
class Job;
class Filter;
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 ();
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;
+ std::vector<FFmpegSubtitleStream> ffmpeg_subtitle_streams () const;
+ boost::optional<FFmpegSubtitleStream> ffmpeg_subtitle_stream () const;
+ std::vector<FFmpegAudioStream> ffmpeg_audio_streams () const;
+ boost::optional<FFmpegAudioStream> ffmpeg_audio_stream () const;
+
+ void set_ffmpeg_subtitle_stream (FFmpegSubtitleStream);
+ void set_ffmpeg_audio_stream (FFmpegAudioStream);
+
+ enum TrimType {
+ CPL,
+ ENCODE
+ };
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
TRIM_START,
TRIM_END,
AB,
+ TRIM_TYPE,
AUDIO_GAIN,
AUDIO_DELAY,
- STILL_DURATION,
- SUBTITLE_STREAM,
WITH_SUBTITLES,
SUBTITLE_OFFSET,
SUBTITLE_SCALE,
COLOUR_LUT,
J2K_BANDWIDTH,
DCI_METADATA,
- DCP_FRAME_RATE
+ DCP_FRAME_RATE,
+ AUDIO_MAPPING
};
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 _dcp_frame_rate;
}
+ AudioMapping audio_mapping () const {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _audio_mapping;
+ }
+
/* SET */
void set_directory (std::string);
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_dci_metadata (DCIMetadata);
void set_dcp_frame_rate (int);
void set_dci_date_today ();
+ void set_audio_mapping (AudioMapping);
/** 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 (boost::weak_ptr<Content>, int);
+ boost::shared_ptr<FFmpegContent> ffmpeg () const;
+ void setup_default_audio_mapping ();
+ 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;
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.
int _dcp_frame_rate;
/** The date that we should use in a DCI name */
boost::gregorian::date _dci_date;
+ AudioMapping _audio_mapping;
/** true if our state has changed since we last saved it */
mutable bool _dirty;