FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film, p)
{
- video.reset (new VideoContent (this, film));
- audio.reset (new AudioContent (this, film));
- subtitle.reset (new SubtitleContent (this, film));
- set_default_colour_conversion ();
}
FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
: Content (film, node)
{
- video.reset (new VideoContent (this, film, node, version));
- audio.reset (new AudioContent (this, film, node));
- subtitle.reset (new SubtitleContent (this, 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);
list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
audio->add_stream (as);
if (version < 11 && !(*i)->optional_node_child ("Selected")) {
/* This is an old file and this stream is not selected, so un-map it */
- as->set_mapping (AudioMapping (_audio_streams.back()->channels (), MAX_DCP_AUDIO_CHANNELS));
+ as->set_mapping (AudioMapping (as->channels (), MAX_DCP_AUDIO_CHANNELS));
}
}
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
- if (fc->subtitle->use_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+ if (fc->subtitle->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
throw JoinError (_("Content to be joined must use the same subtitle stream."));
}
}
{
node->add_child("Type")->add_child_text ("FFmpeg");
Content::as_xml (node);
- video->as_xml (node);
- audio->as_xml (node);
- subtitle->as_xml (node);
+
+ if (video) {
+ video->as_xml (node);
+ }
+
+ if (audio) {
+ audio->as_xml (node);
+ }
+
+ if (subtitle) {
+ subtitle->as_xml (node);
+ }
boost::mutex::scoped_lock lm (_mutex);
Content::examine (job);
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
- video->take_from_video_examiner (examiner);
- set_default_colour_conversion ();
+
+ if (examiner->has_video ()) {
+ video.reset (new VideoContent (this, film ()));
+ video->take_from_examiner (examiner);
+ set_default_colour_conversion ();
+ }
{
boost::mutex::scoped_lock lm (_mutex);
- _subtitle_streams = examiner->subtitle_streams ();
- if (!_subtitle_streams.empty ()) {
- _subtitle_stream = _subtitle_streams.front ();
+ if (examiner->has_video ()) {
+ _first_video = examiner->first_video ();
+ _color_range = examiner->color_range ();
+ _color_primaries = examiner->color_primaries ();
+ _color_trc = examiner->color_trc ();
+ _colorspace = examiner->colorspace ();
+ _bits_per_pixel = examiner->bits_per_pixel ();
}
- BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
- audio->add_stream (i);
- }
+ if (!examiner->audio_streams().empty ()) {
+ audio.reset (new AudioContent (this, film ()));
+
+ BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
+ audio->add_stream (i);
+ }
- if (!audio->streams().empty ()) {
AudioStreamPtr as = audio->streams().front();
AudioMapping m = as->mapping ();
film()->make_audio_mapping_default (m);
as->set_mapping (m);
}
- _first_video = examiner->first_video ();
+ _subtitle_streams = examiner->subtitle_streams ();
+ if (!_subtitle_streams.empty ()) {
+ subtitle.reset (new SubtitleContent (this, film ()));
+ _subtitle_stream = _subtitle_streams.front ();
+ }
- _color_range = examiner->color_range ();
- _color_primaries = examiner->color_primaries ();
- _color_trc = examiner->color_trc ();
- _colorspace = examiner->colorspace ();
- _bits_per_pixel = examiner->bits_per_pixel ();
}
signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
string
FFmpegContent::summary () const
{
- /* Get the string() here so that the name does not have quotes around it */
- return String::compose (_("%1 [movie]"), path_summary ());
+ if (video && audio) {
+ return String::compose (_("%1 [movie]"), path_summary ());
+ } else if (video) {
+ return String::compose (_("%1 [video]"), path_summary ());
+ } else if (audio) {
+ return String::compose (_("%1 [audio]"), path_summary ());
+ }
+
+ return path_summary ();
}
string
string filt = Filter::ffmpeg_string (_filters);
- return Content::technical_summary() + " - "
- + video->technical_summary() + " - "
- + audio->technical_summary() + " - "
- + String::compose (
- "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt
- );
+ string s = Content::technical_summary ();
+
+ if (video) {
+ s += " - " + video->technical_summary ();
+ }
+
+ if (audio) {
+ s += " - " + audio->technical_summary ();
+ }
+
+ return s + String::compose (
+ "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt
+ );
}
void
DCPTime
FFmpegContent::full_length () const
{
- FrameRateChange const frc (video->video_frame_rate (), film()->video_frame_rate ());
- return DCPTime::from_frames (llrint (video->video_length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+ FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
+ if (video) {
+ return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+ }
+
+ DCPOMATIC_ASSERT (audio);
+ return DCPTime::from_frames (llrint (audio->stream()->length() / frc.speed_up), audio->stream()->frame_rate());
}
void
{
SafeStringStream s;
- s << Content::identifier() << "_"
- << video->identifier() << "_"
- << subtitle->identifier();
+ s << Content::identifier();
+
+ if (video) {
+ s << "_" << video->identifier();
+ }
+
+ if (subtitle) {
+ s << "_" << subtitle->identifier();
+ }
boost::mutex::scoped_lock lm (_mutex);
return stream->text_subtitles_during (period, starting);
}
-bool
-FFmpegContent::has_image_subtitles () const
-{
- BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, subtitle_streams()) {
- if (i->has_image_subtitles()) {
- return true;
- }
- }
-
- return false;
-}
-
-bool
-FFmpegContent::has_text_subtitles () const
-{
- BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, subtitle_streams()) {
- if (i->has_text_subtitles()) {
- return true;
- }
- }
-
- return false;
-}
-
void
FFmpegContent::set_default_colour_conversion ()
{
- dcp::Size const s = video->video_size ();
+ dcp::Size const s = video->size ();
boost::mutex::scoped_lock lm (_mutex);
}
}
-vector<AudioStreamPtr>
-FFmpegContent::audio_streams () const
-{
- boost::mutex::scoped_lock lm (_mutex);
-
- vector<AudioStreamPtr> s;
- copy (_audio_streams.begin(), _audio_streams.end(), back_inserter (s));
- return s;
-}
-
void
FFmpegContent::add_properties (list<UserProperty>& p) const
{
signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
}
-void
-FFmpegContent::changed (int property)
+vector<shared_ptr<FFmpegAudioStream> >
+FFmpegContent::ffmpeg_audio_streams () const
{
- if (property == VideoContentProperty::VIDEO_FRAME_RATE && subtitle) {
- subtitle->set_subtitle_video_frame_rate (video->video_frame_rate ());
+ vector<shared_ptr<FFmpegAudioStream> > fa;
+
+ if (audio) {
+ BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+ fa.push_back (dynamic_pointer_cast<FFmpegAudioStream> (i));
+ }
}
+
+ return fa;
}
projects / dcpomatic.git / blobdiff