X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=b7551c96af36ed3a85e47671ac6e1237a8d96499;hb=4ec7a8070dfcda1fa327df6378eaab754f119f1b;hp=e843e1e168c3fbb71e561279b9babe2debf6b376;hpb=c3da7c64f01420447dbab7f5c2ea42ff1b911cc5;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index e843e1e16..b7551c96a 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,6 +17,9 @@
 
 */
 
+extern "C" {
+#include <libavformat/avformat.h>
+}
 #include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
 #include "ffmpeg_examiner.h"
@@ -55,11 +58,11 @@ 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, shared_ptr<const cxml::Node> 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<cxml::NodePtr> c = node->node_children ("SubtitleStream");
 	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -71,7 +74,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 
 	c = node->node_children ("AudioStream");
 	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
-		_audio_streams.push_back (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (*i)));
+		_audio_streams.push_back (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (*i, version)));
 		if ((*i)->optional_number_child<int> ("Selected")) {
 			_audio_stream = _audio_streams.back ();
 		}
@@ -79,7 +82,12 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 
 	c = node->node_children ("Filter");
 	for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
-		_filters.push_back (Filter::from_id ((*i)->content ()));
+		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<double> ("FirstVideo");
@@ -93,10 +101,10 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr
 {
 	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 (*(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+		if (f->with_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
 			throw JoinError (_("Content to be joined must use the same subtitle stream."));
 		}
 
@@ -204,21 +212,21 @@ FFmpegContent::technical_summary () const
 {
 	string as = "none";
 	if (_audio_stream) {
-		as = String::compose ("id %1", _audio_stream->id);
+		as = _audio_stream->technical_summary ();
 	}
 
 	string ss = "none";
 	if (_subtitle_stream) {
-		ss = String::compose ("id %1", _subtitle_stream->id);
+		ss = _subtitle_stream->technical_summary ();
 	}
 
-	pair<string, string> filt = Filter::ffmpeg_strings (_filters);
+	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 %4", as, ss, filt.first, filt.second
+			"ffmpeg: audio %1, subtitle %2, filters %3", as, ss, filt
 			);
 }
 
@@ -231,7 +239,7 @@ FFmpegContent::information () const
 	
 	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(), video_frame_rate()) << "\n";
 	s << VideoContent::information ();
 
 	return s.str ();
@@ -264,7 +272,7 @@ FFmpegContent::audio_length () const
 {
 	int const cafr = content_audio_frame_rate ();
 	int const vfr  = video_frame_rate ();
-	VideoContent::Frame const vl = video_length ();
+	VideoContent::Frame const vl = video_length_after_3d_combine ();
 
 	boost::mutex::scoped_lock lm (_mutex);
 	if (!_audio_stream) {
@@ -323,34 +331,35 @@ FFmpegContent::output_audio_frame_rate () const
 }
 
 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!= (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 (shared_ptr<const cxml::Node> node)
+	: name (node->string_child ("Name"))
+	, _id (node->number_child<int> ("Id"))
 {
-	return a.id == b.id;
+
 }
 
-bool
-operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
+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 (lexical_cast<string> (_id));
 }
 
-FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
-	: mapping (node->node_child ("Mapping"))
+FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> 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");
 	first_audio = node->optional_number_child<double> ("FirstAudio");
@@ -359,8 +368,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
 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));
+	FFmpegStream::as_xml (root);
 	root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
 	root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
 	if (first_audio) {
@@ -369,21 +377,49 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	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)
+	: 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);
 }
 
 Time
@@ -393,7 +429,7 @@ FFmpegContent::full_length () const
 	assert (film);
 	
 	FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate ();
+	return video_length_after_3d_combine() * frc.factor() * TIME_HZ / film->video_frame_rate ();
 }
 
 AudioMapping
@@ -436,7 +472,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) {
@@ -446,3 +482,23 @@ 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;
+}