X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=4ae5546c2c2daa38a76a07c770eba837f572047a;hb=3753cb8685e1755b067676345a5871db24149d0f;hp=a6f9e6ac89140fb967ec7e1fa51aedd77978698f;hpb=d324fc102df00d6dc62614938f78cf983a101dd4;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a6f9e6ac8..4ae5546c2 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"
@@ -26,6 +29,7 @@
 #include "filter.h"
 #include "film.h"
 #include "log.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
@@ -37,6 +41,7 @@ using std::cout;
 using std::pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
@@ -53,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)
 	: 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) {
@@ -69,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 ();
 		}
@@ -83,6 +88,33 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
 	_first_video = node->optional_number_child<double> ("FirstVideo");
 }
 
+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
 FFmpegContent::as_xml (xmlpp::Node* node) const
 {
@@ -167,7 +199,7 @@ string
 FFmpegContent::summary () const
 {
 	/* Get the string() here so that the name does not have quotes around it */
-	return String::compose (_("%1 [movie]"), path().filename().string());
+	return String::compose (_("%1 [movie]"), path_summary ());
 }
 
 string
@@ -175,12 +207,12 @@ 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);
@@ -294,22 +326,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== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
+operator!= (FFmpegStream const & a, FFmpegStream 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"))
+FFmpegStream::FFmpegStream (shared_ptr<const cxml::Node> node)
+	: name (node->string_child ("Name"))
+	, _id (node->number_child<int> ("Id"))
+{
+
+}
+
+void
+FFmpegStream::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));
+}
+
+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");
@@ -318,8 +363,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) {
@@ -328,21 +372,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
@@ -395,7 +467,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) {