#include "dcp_content.h"
#include "video_content.h"
+#include "audio_content.h"
#include "dcp_examiner.h"
#include "job.h"
#include "film.h"
#include "overlaps.h"
#include "compose.hpp"
#include "dcp_decoder.h"
+#include "subtitle_content.h"
#include <dcp/dcp.h>
#include <dcp/exceptions.h>
#include <dcp/reel_picture_asset.h>
using std::cout;
using std::distance;
using std::pair;
+using std::vector;
using std::list;
using boost::shared_ptr;
using boost::scoped_ptr;
DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film)
- , SingleStreamAudioContent (film)
- , SubtitleContent (film)
- , video (new VideoContent (film))
- , _has_subtitles (false)
, _encrypted (false)
, _kdm_valid (false)
, _reference_video (false)
, _reference_audio (false)
, _reference_subtitle (false)
{
+ video.reset (new VideoContent (this, film));
+ audio.reset (new AudioContent (this, film));
+
read_directory (p);
set_default_colour_conversion ();
}
DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
: Content (film, node)
- , SingleStreamAudioContent (film, node, version)
- , SubtitleContent (film, node, version)
- , video (new VideoContent (film, node, version))
{
+ video = VideoContent::from_xml (this, film, node, version);
+ audio = AudioContent::from_xml (this, film, node);
+ subtitle = SubtitleContent::from_xml (this, film, node, version);
+
+ audio->set_stream (
+ AudioStreamPtr (
+ new AudioStream (
+ node->number_child<int> ("AudioFrameRate"),
+ node->number_child<Frame> ("AudioLength"),
+ AudioMapping (node->node_child ("AudioMapping"), version)
+ )
+ )
+ );
+
_name = node->string_child ("Name");
- _has_subtitles = node->bool_child ("HasSubtitles");
+
_encrypted = node->bool_child ("Encrypted");
if (node->optional_node_child ("KDM")) {
_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
Content::examine (job);
shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
- take_from_video_examiner (examiner);
+ video->take_from_examiner (examiner);
set_default_colour_conversion ();
- take_from_audio_examiner (examiner);
+
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+
+ AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
+ audio->set_stream (as);
+ AudioMapping m = as->mapping ();
+ film()->make_audio_mapping_default (m);
+ as->set_mapping (m);
+ }
+
+ signal_changed (AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
_name = examiner->name ();
- _has_subtitles = examiner->has_subtitles ();
+ if (examiner->has_subtitles ()) {
+ subtitle.reset (new SubtitleContent (this, film()));
+ }
_encrypted = examiner->encrypted ();
_kdm_valid = examiner->kdm_valid ();
}
{
return Content::technical_summary() + " - "
+ video->technical_summary() + " - "
- + AudioContent::technical_summary() + " - ";
+ + audio->technical_summary() + " - ";
}
void
node->add_child("Type")->add_child_text ("DCP");
Content::as_xml (node);
- video->as_xml (node);
- SingleStreamAudioContent::as_xml (node);
- SubtitleContent::as_xml (node);
+
+ if (video) {
+ video->as_xml (node);
+ }
+
+ if (audio) {
+ audio->as_xml (node);
+ node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate()));
+ node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio->stream()->length()));
+ audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+ }
+
+ if (subtitle) {
+ subtitle->as_xml (node);
+ }
boost::mutex::scoped_lock lm (_mutex);
node->add_child("Name")->add_child_text (_name);
- node->add_child("HasSubtitles")->add_child_text (_has_subtitles ? "1" : "0");
node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
if (_kdm) {
node->add_child("KDM")->add_child_text (_kdm->as_xml ());
DCPTime
DCPContent::full_length () const
{
- FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ());
- return DCPTime::from_frames (llrint (video_length () * frc.factor ()), film()->video_frame_rate ());
+ FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
+ return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ());
}
string
DCPContent::identifier () const
{
SafeStringStream s;
- s << Content::identifier() << "_" << video->identifier() << "_" << SubtitleContent::identifier () << " "
- << (_reference_video ? "1" : "0")
+ s << Content::identifier() << "_" << video->identifier() << "_";
+ if (subtitle) {
+ s << subtitle->identifier () << " ";
+ }
+ s << (_reference_video ? "1" : "0")
<< (_reference_subtitle ? "1" : "0");
return s.str ();
}
void
DCPContent::add_properties (list<UserProperty>& p) const
{
- SingleStreamAudioContent::add_properties (p);
+ audio->add_properties (p);
}
void
DCPContent::set_default_colour_conversion ()
{
/* Default to no colour conversion for DCPs */
- unset_colour_conversion ();
+ video->unset_colour_conversion ();
}
void
list<DCPTimePeriod> p;
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), false));
+ decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
} catch (...) {
/* Could not load the DCP; guess reels */
list<DCPTimePeriod> p;
bool
DCPContent::can_reference_video (list<string>& why_not) const
{
- return can_reference<VideoContent> (_("There is other video content overlapping this DCP; remove it."), why_not);
+ /* XXX: this needs to be fixed */
+ return true;
}
bool
DCPContent::can_reference_audio (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), false);
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
- if (!i->main_sound()) {
- why_not.push_back (_("The DCP does not have sound in all reels."));
- return false;
- }
- }
-
- return can_reference<AudioContent> (_("There is other audio content overlapping this DCP; remove it."), why_not);
+ /* XXX: this needs to be fixed */
+ return true;
}
bool
DCPContent::can_reference_subtitle (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), false);
- BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
- if (!i->main_subtitle()) {
- why_not.push_back (_("The DCP does not have subtitles in all reels."));
- return false;
- }
- }
-
- return can_reference<SubtitleContent> (_("There is other subtitle content overlapping this DCP; remove it."), why_not);
+ /* XXX: this needs to be fixed */
+ return true;
}
projects / dcpomatic.git / blobdiff