X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=de967c04554cb843c08a8cbb09330078d483e1a6;hb=a1b0ed4ac0753b420ce8ab8467165e220bdb4b05;hp=68132c5abf94bea8aedd52196b8520712b0c1e8c;hpb=46cd0fe7b5b514f0d9456b25f670679cc584a218;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 68132c5ab..de967c045 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,6 +34,7 @@ using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
+using std::pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
@@ -47,6 +48,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path
 	: Content (f, p)
 	, VideoContent (f, p)
 	, AudioContent (f, p)
+	, SubtitleContent (f, p)
 {
 
 }
@@ -55,6 +57,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 	: Content (f, node)
 	, VideoContent (f, node)
 	, AudioContent (f, node)
+	, SubtitleContent (f, node)
 {
 	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) {
@@ -77,19 +80,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 		_filters.push_back (Filter::from_id ((*i)->content ()));
 	}
 
-	_first_video = node->optional_number_child<Time> ("FirstVideo");
-}
-
-FFmpegContent::FFmpegContent (FFmpegContent const & o)
-	: Content (o)
-	, VideoContent (o)
-	, AudioContent (o)
-	, _subtitle_streams (o._subtitle_streams)
-	, _subtitle_stream (o._subtitle_stream)
-	, _audio_streams (o._audio_streams)
-	, _audio_stream (o._audio_stream)
-{
-
+	_first_video = node->optional_number_child<double> ("FirstVideo");
 }
 
 void
@@ -99,6 +90,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 	Content::as_xml (node);
 	VideoContent::as_xml (node);
 	AudioContent::as_xml (node);
+	SubtitleContent::as_xml (node);
 
 	boost::mutex::scoped_lock lm (_mutex);
 
@@ -139,42 +131,66 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
 
-	ContentVideoFrame video_length = 0;
+	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));
 
-        {
-                boost::mutex::scoped_lock lm (_mutex);
+	{
+		boost::mutex::scoped_lock lm (_mutex);
 
-                _video_length = video_length;
+		_video_length = video_length;
 
-                _subtitle_streams = examiner->subtitle_streams ();
-                if (!_subtitle_streams.empty ()) {
-                        _subtitle_stream = _subtitle_streams.front ();
-                }
-                
-                _audio_streams = examiner->audio_streams ();
-                if (!_audio_streams.empty ()) {
-                        _audio_stream = _audio_streams.front ();
-                }
+		_subtitle_streams = examiner->subtitle_streams ();
+		if (!_subtitle_streams.empty ()) {
+			_subtitle_stream = _subtitle_streams.front ();
+		}
+		
+		_audio_streams = examiner->audio_streams ();
+		if (!_audio_streams.empty ()) {
+			_audio_stream = _audio_streams.front ();
+		}
 
 		_first_video = examiner->first_video ();
-        }
+	}
 
-        take_from_video_examiner (examiner);
+	take_from_video_examiner (examiner);
 
-        signal_changed (ContentProperty::LENGTH);
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
-        signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
-        signal_changed (FFmpegContentProperty::AUDIO_STREAM);
-        signal_changed (AudioContentProperty::AUDIO_CHANNELS);
+	signal_changed (ContentProperty::LENGTH);
+	signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
+	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+	signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
+	signal_changed (FFmpegContentProperty::AUDIO_STREAM);
+	signal_changed (AudioContentProperty::AUDIO_CHANNELS);
 }
 
 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().filename().string());
+}
+
+string
+FFmpegContent::technical_summary () const
+{
+	string as = "none";
+	if (_audio_stream) {
+		as = String::compose ("id %1", _audio_stream->id);
+	}
+
+	string ss = "none";
+	if (_subtitle_stream) {
+		ss = String::compose ("id %1", _subtitle_stream->id);
+	}
+
+	pair<string, string> filt = Filter::ffmpeg_strings (_filters);
+	
+	return Content::technical_summary() + " - "
+		+ VideoContent::technical_summary() + " - "
+		+ AudioContent::technical_summary() + " - "
+		+ String::compose (
+			"ffmpeg: audio %1, subtitle %2, filters %3 %4", as, ss, filt.first, filt.second
+			);
 }
 
 string
@@ -195,38 +211,38 @@ FFmpegContent::information () const
 void
 FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
 {
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _subtitle_stream = s;
-        }
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_subtitle_stream = s;
+	}
 
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 void
 FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 {
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _audio_stream = s;
-        }
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_stream = s;
+	}
 
-        signal_changed (FFmpegContentProperty::AUDIO_STREAM);
+	signal_changed (FFmpegContentProperty::AUDIO_STREAM);
 }
 
-ContentAudioFrame
+AudioContent::Frame
 FFmpegContent::audio_length () const
 {
 	int const cafr = content_audio_frame_rate ();
 	int const vfr  = video_frame_rate ();
-	ContentVideoFrame const vl = video_length ();
+	VideoContent::Frame const vl = video_length ();
 
 	boost::mutex::scoped_lock lm (_mutex);
-        if (!_audio_stream) {
-                return 0;
-        }
-        
-        return video_frames_to_audio_frames (vl, cafr, vfr);
+	if (!_audio_stream) {
+		return 0;
+	}
+	
+	return video_frames_to_audio_frames (vl, cafr, vfr);
 }
 
 int
@@ -234,11 +250,11 @@ FFmpegContent::audio_channels () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 	
-        if (!_audio_stream) {
-                return 0;
-        }
+	if (!_audio_stream) {
+		return 0;
+	}
 
-        return _audio_stream->channels;
+	return _audio_stream->channels;
 }
 
 int
@@ -246,11 +262,11 @@ FFmpegContent::content_audio_frame_rate () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-        if (!_audio_stream) {
-                return 0;
-        }
+	if (!_audio_stream) {
+		return 0;
+	}
 
-        return _audio_stream->frame_rate;
+	return _audio_stream->frame_rate;
 }
 
 int
@@ -262,7 +278,7 @@ FFmpegContent::output_audio_frame_rate () const
 	/* 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());
+	FrameRateConversion frc (video_frame_rate(), film->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
@@ -271,7 +287,7 @@ FFmpegContent::output_audio_frame_rate () const
 	*/
 
 	if (frc.change_speed) {
-		t *= video_frame_rate() * frc.factor() / film->dcp_video_frame_rate();
+		t *= video_frame_rate() * frc.factor() / film->video_frame_rate();
 	}
 
 	return rint (t);
@@ -280,23 +296,23 @@ FFmpegContent::output_audio_frame_rate () const
 bool
 operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
 {
-        return a.id == b.id;
+	return a.id == b.id;
 }
 
 bool
 operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
 {
-        return a.id == b.id;
+	return a.id == b.id;
 }
 
 FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
+	: mapping (node->node_child ("Mapping"))
 {
 	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"));
-	start = node->optional_number_child<Time> ("Start");
+	first_audio = node->optional_number_child<double> ("FirstAudio");
 }
 
 void
@@ -306,8 +322,8 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	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));
-	if (start) {
-		root->add_child("Start")->add_child_text (lexical_cast<string> (start));
+	if (first_audio) {
+		root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio.get ()));
 	}
 	mapping.as_xml (root->add_child("Mapping"));
 }
@@ -329,20 +345,14 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 	root->add_child("Id")->add_child_text (lexical_cast<string> (id));
 }
 
-shared_ptr<Content>
-FFmpegContent::clone () const
-{
-	return shared_ptr<Content> (new FFmpegContent (*this));
-}
-
 Time
-FFmpegContent::length () const
+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 ();
+	FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ());
+	return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate ();
 }
 
 AudioMapping
@@ -374,3 +384,24 @@ FFmpegContent::set_audio_mapping (AudioMapping m)
 	audio_stream()->mapping = m;
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+
+string
+FFmpegContent::identifier () const
+{
+	stringstream s;
+
+	s << VideoContent::identifier();
+
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if (_subtitle_stream) {
+		s << "_" << _subtitle_stream->id;
+	}
+
+	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+		s << "_" << (*i)->id ();
+	}
+
+	return s.str ();
+}
+