X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=d15f3fd26a8fcbe47175fdb23e966964a1bd5d51;hb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569;hp=88fc6dbd237c3aa09a020c474e91250f24865201;hpb=0eee0c3adda726542a5f2b8fad68f54ebf701392;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 88fc6dbd2..d15f3fd26 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,11 @@
 
 */
 
+extern "C" {
+#include <libavformat/avformat.h>
+}
 #include <libcxml/cxml.h>
+#include <libdcp/raw_convert.h>
 #include "ffmpeg_content.h"
 #include "ffmpeg_examiner.h"
 #include "compose.hpp"
@@ -26,6 +30,7 @@
 #include "filter.h"
 #include "film.h"
 #include "log.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
@@ -34,8 +39,10 @@ using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
+using std::pair;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
+using libdcp::raw_convert;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
@@ -52,14 +59,14 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path
 
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version, list<string>& notes)
 	: Content (f, node)
-	, VideoContent (f, node)
+	, VideoContent (f, node, version)
 	, AudioContent (f, node)
-	, SubtitleContent (f, node)
+	, SubtitleContent (f, node, version)
 {
-	list<shared_ptr<cxml::Node> > c = node->node_children ("SubtitleStream");
-	for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
+	list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
+	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
 		_subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (*i)));
 		if ((*i)->optional_number_child<int> ("Selected")) {
 			_subtitle_stream = _subtitle_streams.back ();
@@ -67,32 +74,51 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 	}
 
 	c = node->node_children ("AudioStream");
-	for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
-		_audio_streams.push_back (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (*i)));
+	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
+		_audio_streams.push_back (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (*i, version)));
 		if ((*i)->optional_number_child<int> ("Selected")) {
 			_audio_stream = _audio_streams.back ();
 		}
 	}
 
 	c = node->node_children ("Filter");
-	for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-		_filters.push_back (Filter::from_id ((*i)->content ()));
+	for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
+		Filter const * f = Filter::from_id ((*i)->content ());
+		if (f) {
+			_filters.push_back (f);
+		} else {
+			notes.push_back (String::compose (_("DCP-o-matic no longer supports the `%1' filter, so it has been turned off."), (*i)->content()));
+		}
 	}
 
-	_first_video = node->optional_number_child<Time> ("FirstVideo");
+	_first_video = node->optional_number_child<double> ("FirstVideo");
 }
 
-FFmpegContent::FFmpegContent (FFmpegContent const & o)
-	: Content (o)
-	, VideoContent (o)
-	, AudioContent (o)
-	, SubtitleContent (o)
-	, _subtitle_streams (o._subtitle_streams)
-	, _subtitle_stream (o._subtitle_stream)
-	, _audio_streams (o._audio_streams)
-	, _audio_stream (o._audio_stream)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr<Content> > c)
+	: Content (f, c)
+	, VideoContent (f, c)
+	, AudioContent (f, c)
+	, SubtitleContent (f, c)
 {
+	shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
+	assert (ref);
+
+	for (size_t i = 0; i < c.size(); ++i) {
+		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
+		if (f->with_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+			throw JoinError (_("Content to be joined must use the same subtitle stream."));
+		}
+
+		if (*(fc->_audio_stream.get()) != *(ref->_audio_stream.get())) {
+			throw JoinError (_("Content to be joined must use the same audio stream."));
+		}
+	}
 
+	_subtitle_streams = ref->subtitle_streams ();
+	_subtitle_stream = ref->subtitle_stream ();
+	_audio_streams = ref->audio_streams ();
+	_audio_stream = ref->audio_stream ();
+	_first_video = ref->_first_video;
 }
 
 void
@@ -127,7 +153,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 	}
 
 	if (_first_video) {
-		node->add_child("FirstVideo")->add_child_text (lexical_cast<string> (_first_video.get ()));
+		node->add_child("FirstVideo")->add_child_text (raw_convert<string> (_first_video.get().get()));
 	}
 }
 
@@ -138,14 +164,14 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 	Content::examine (job);
 
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
+	take_from_video_examiner (examiner);
 
-	VideoContent::Frame video_length = 0;
-	video_length = examiner->video_length ();
-	film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
+	ContentTime video_length = examiner->video_length ();
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())));
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -165,8 +191,6 @@ FFmpegContent::examine (shared_ptr<Job> job)
 		_first_video = examiner->first_video ();
 	}
 
-	take_from_video_examiner (examiner);
-
 	signal_changed (ContentProperty::LENGTH);
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
@@ -178,19 +202,43 @@ FFmpegContent::examine (shared_ptr<Job> job)
 string
 FFmpegContent::summary () const
 {
-	return String::compose (_("Movie: %1"), file().filename().string());
+	/* Get the string() here so that the name does not have quotes around it */
+	return String::compose (_("%1 [movie]"), path_summary ());
+}
+
+string
+FFmpegContent::technical_summary () const
+{
+	string as = "none";
+	if (_audio_stream) {
+		as = _audio_stream->technical_summary ();
+	}
+
+	string ss = "none";
+	if (_subtitle_stream) {
+		ss = _subtitle_stream->technical_summary ();
+	}
+
+	string filt = Filter::ffmpeg_string (_filters);
+	
+	return Content::technical_summary() + " - "
+		+ VideoContent::technical_summary() + " - "
+		+ AudioContent::technical_summary() + " - "
+		+ String::compose (
+			"ffmpeg: audio %1, subtitle %2, filters %3", as, ss, filt
+			);
 }
 
 string
 FFmpegContent::information () const
 {
-	if (video_length() == 0 || video_frame_rate() == 0) {
+	if (video_length() == ContentTime (0) || video_frame_rate() == 0) {
 		return "";
 	}
 	
 	stringstream s;
 	
-	s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n";
+	s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine().frames (video_frame_rate()), video_frame_rate()) << "\n";
 	s << VideoContent::information ();
 
 	return s.str ();
@@ -218,19 +266,14 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 	signal_changed (FFmpegContentProperty::AUDIO_STREAM);
 }
 
-AudioContent::Frame
+ContentTime
 FFmpegContent::audio_length () const
 {
-	int const cafr = content_audio_frame_rate ();
-	int const vfr  = video_frame_rate ();
-	VideoContent::Frame const vl = video_length ();
-
-	boost::mutex::scoped_lock lm (_mutex);
-	if (!_audio_stream) {
-		return 0;
+	if (!audio_stream ()) {
+		return ContentTime ();
 	}
-	
-	return video_frames_to_audio_frames (vl, cafr, vfr);
+
+	return video_length ();
 }
 
 int
@@ -246,7 +289,7 @@ FFmpegContent::audio_channels () const
 }
 
 int
-FFmpegContent::content_audio_frame_rate () const
+FFmpegContent::audio_frame_rate () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
@@ -257,96 +300,104 @@ FFmpegContent::content_audio_frame_rate () const
 	return _audio_stream->frame_rate;
 }
 
-int
-FFmpegContent::output_audio_frame_rate () const
+bool
+operator== (FFmpegStream const & a, FFmpegStream const & b)
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_frame_rate (content_audio_frame_rate ());
-
-	FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate());
-
-	/* Compensate if the DCP is being run at a different frame rate
-	   to the source; that is, if the video is run such that it will
-	   look different in the DCP compared to the source (slower or faster).
-	   skip/repeat doesn't come into effect here.
-	*/
-
-	if (frc.change_speed) {
-		t *= video_frame_rate() * frc.factor() / film->dcp_video_frame_rate();
-	}
-
-	return rint (t);
+	return a._id == b._id;
 }
 
 bool
-operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
+operator!= (FFmpegStream const & a, FFmpegStream const & b)
 {
-	return a.id == b.id;
+	return a._id != b._id;
 }
 
-bool
-operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
+FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
+	: name (node->string_child ("Name"))
+	, _id (node->number_child<int> ("Id"))
+{
+
+}
+
+void
+FFmpegStream::as_xml (xmlpp::Node* root) const
 {
-	return a.id == b.id;
+	root->add_child("Name")->add_child_text (name);
+	root->add_child("Id")->add_child_text (raw_convert<string> (_id));
 }
 
-FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
+FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
+	: FFmpegStream (node)
+	, mapping (node->node_child ("Mapping"), version)
 {
-	name = node->string_child ("Name");
-	id = node->number_child<int> ("Id");
 	frame_rate = node->number_child<int> ("FrameRate");
 	channels = node->number_child<int64_t> ("Channels");
-	mapping = AudioMapping (node->node_child ("Mapping"));
-	first_audio = node->optional_number_child<Time> ("FirstAudio");
+	first_audio = node->optional_number_child<double> ("FirstAudio");
 }
 
 void
 FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 {
-	root->add_child("Name")->add_child_text (name);
-	root->add_child("Id")->add_child_text (lexical_cast<string> (id));
-	root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
-	root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
+	FFmpegStream::as_xml (root);
+	root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate));
+	root->add_child("Channels")->add_child_text (raw_convert<string> (channels));
 	if (first_audio) {
-		root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio));
+		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get()));
 	}
 	mapping.as_xml (root->add_child("Mapping"));
 }
 
+bool
+FFmpegStream::uses_index (AVFormatContext const * fc, int index) const
+{
+	size_t i = 0;
+	while (i < fc->nb_streams) {
+		if (fc->streams[i]->id == _id) {
+			return int (i) == index;
+		}
+		++i;
+	}
+
+	return false;
+}
+
+AVStream *
+FFmpegStream::stream (AVFormatContext const * fc) const
+{
+	size_t i = 0;
+	while (i < fc->nb_streams) {
+		if (fc->streams[i]->id == _id) {
+			return fc->streams[i];
+		}
+		++i;
+	}
+
+	assert (false);
+	return 0;
+}
+
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
  *  @param v State file version.
  */
-FFmpegSubtitleStream::FFmpegSubtitleStream (shared_ptr<const cxml::Node> node)
+FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
+	: FFmpegStream (node)
 {
-	name = node->string_child ("Name");
-	id = node->number_child<int> ("Id");
+	
 }
 
 void
 FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 {
-	root->add_child("Name")->add_child_text (name);
-	root->add_child("Id")->add_child_text (lexical_cast<string> (id));
+	FFmpegStream::as_xml (root);
 }
 
-shared_ptr<Content>
-FFmpegContent::clone () const
-{
-	return shared_ptr<Content> (new FFmpegContent (*this));
-}
-
-Time
-FFmpegContent::length () const
+DCPTime
+FFmpegContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	
-	FrameRateConversion frc (video_frame_rate (), film->dcp_video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
+	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
 }
 
 AudioMapping
@@ -376,7 +427,7 @@ void
 FFmpegContent::set_audio_mapping (AudioMapping m)
 {
 	audio_stream()->mapping = m;
-	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+	AudioContent::set_audio_mapping (m);
 }
 
 string
@@ -389,7 +440,7 @@ FFmpegContent::identifier () const
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_subtitle_stream) {
-		s << "_" << _subtitle_stream->id;
+		s << "_" << _subtitle_stream->identifier ();
 	}
 
 	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
@@ -398,3 +449,24 @@ FFmpegContent::identifier () const
 
 	return s.str ();
 }
+
+boost::filesystem::path
+FFmpegContent::audio_analysis_path () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return boost::filesystem::path ();
+	}
+
+	/* We need to include the stream ID in this path so that we get different
+	   analyses for each stream.
+	*/
+
+	boost::filesystem::path p = film->audio_analysis_dir ();
+	string name = digest ();
+	if (audio_stream ()) {
+		name += "_" + audio_stream()->identifier ();
+	}
+	p /= name;
+	return p;
+}