X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=2b494dc9233259afdf2f73e30c1c015777b311ed;hp=3f0a692cdd646f7e08444920ebc7e03eaea114d6;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=dea824f6ff41384a5e17e23de5434cf84eccff29

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 3f0a692cd..2b494dc92 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,7 +32,7 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
-#include "caption_content.h"
+#include "text_content.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {
@@ -45,7 +45,7 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::string;
 using std::vector;
@@ -63,8 +63,9 @@ int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
 int const FFmpegContentProperty::FILTERS = 102;
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
-	: Content (film, p)
+FFmpegContent::FFmpegContent (boost::filesystem::path p)
+	: Content (p)
+	, _encrypted (false)
 {
 
 }
@@ -80,12 +81,12 @@ get_optional_enum (cxml::ConstNodePtr node, string name)
 	return static_cast<T>(*v);
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
-	: Content (film, node)
+FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list<string>& notes)
+	: Content (node)
 {
 	video = VideoContent::from_xml (this, node, version);
 	audio = AudioContent::from_xml (this, node, version);
-	caption = CaptionContent::from_xml (this, node, version);
+	text = TextContent::from_xml (this, node, version);
 
 	list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
 	for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -125,22 +126,23 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 	_color_trc = get_optional_enum<AVColorTransferCharacteristic>(node, "ColorTransferCharacteristic");
 	_colorspace = get_optional_enum<AVColorSpace>(node, "Colorspace");
 	_bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
-
+	_decryption_key = node->optional_string_child ("DecryptionKey");
+	_encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
-	: Content (film, c)
+FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
+	: Content (c)
 {
 	vector<shared_ptr<Content> >::const_iterator i = c.begin ();
 
 	bool need_video = false;
 	bool need_audio = false;
-	bool need_caption = false;
+	bool need_text = false;
 
 	if (i != c.end ()) {
 		need_video = static_cast<bool> ((*i)->video);
 		need_audio = static_cast<bool> ((*i)->audio);
-		need_caption = !(*i)->caption.empty();
+		need_text = !(*i)->text.empty();
 	}
 
 	while (i != c.end ()) {
@@ -150,8 +152,8 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Con
 		if (need_audio != static_cast<bool> ((*i)->audio)) {
 			throw JoinError (_("Content to be joined must all have or not have audio"));
 		}
-		if (need_caption != !(*i)->caption.empty()) {
-			throw JoinError (_("Content to be joined must all have or not have captions"));
+		if (need_text != !(*i)->text.empty()) {
+			throw JoinError (_("Content to be joined must all have or not have subtitles or captions"));
 		}
 		++i;
 	}
@@ -162,8 +164,8 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Con
 	if (need_audio) {
 		audio.reset (new AudioContent (this, c));
 	}
-	if (need_caption) {
-		caption.push_back (shared_ptr<CaptionContent> (new CaptionContent (this, c)));
+	if (need_text) {
+		text.push_back (shared_ptr<TextContent> (new TextContent (this, c)));
 	}
 
 	shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
@@ -171,7 +173,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Con
 
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
-		if (fc->only_caption() && fc->only_caption()->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+		if (fc->only_text() && fc->only_text()->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
 			throw JoinError (_("Content to be joined must use the same subtitle stream."));
 		}
 	}
@@ -187,6 +189,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Con
 	_color_trc = ref->_color_trc;
 	_colorspace = ref->_colorspace;
 	_bits_per_pixel = ref->_bits_per_pixel;
+	_encrypted = ref->_encrypted;
 }
 
 void
@@ -209,8 +212,8 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 		}
 	}
 
-	if (only_caption()) {
-		only_caption()->as_xml (node);
+	if (only_text()) {
+		only_text()->as_xml (node);
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
@@ -246,14 +249,23 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 	if (_bits_per_pixel) {
 		node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (*_bits_per_pixel));
 	}
+	if (_decryption_key) {
+		node->add_child("DecryptionKey")->add_child_text (_decryption_key.get());
+	}
+	if (_encrypted) {
+		node->add_child("Encypted")->add_child_text ("1");
+	}
 }
 
 void
-FFmpegContent::examine (shared_ptr<Job> job)
+FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
+	ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
+	ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
+
 	job->set_progress_unknown ();
 
-	Content::examine (job);
+	Content::examine (film, job);
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
 
@@ -297,25 +309,23 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 			AudioStreamPtr as = audio->streams().front();
 			AudioMapping m = as->mapping ();
-			film()->make_audio_mapping_default (m, first_path);
+			film->make_audio_mapping_default (m, first_path);
 			as->set_mapping (m);
 		}
 
 		_subtitle_streams = examiner->subtitle_streams ();
 		if (!_subtitle_streams.empty ()) {
-			caption.clear ();
-			caption.push_back (shared_ptr<CaptionContent> (new CaptionContent (this, CAPTION_OPEN)));
+			text.clear ();
+			text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
 			_subtitle_stream = _subtitle_streams.front ();
 		}
 
+		_encrypted = first_path.extension() == ".ecinema";
 	}
 
 	if (examiner->has_video ()) {
 		set_default_colour_conversion ();
 	}
-
-	signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 string
@@ -369,12 +379,12 @@ FFmpegContent::technical_summary () const
 void
 FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
 {
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_subtitle_stream = s;
 	}
-
-	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 bool
@@ -390,11 +400,11 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 }
 
 DCPTime
-FFmpegContent::full_length () const
+FFmpegContent::full_length (shared_ptr<const Film> film) const
 {
-	FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
+	FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate());
 	if (video) {
-		return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+		return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 	}
 
 	DCPOMATIC_ASSERT (audio);
@@ -410,12 +420,12 @@ FFmpegContent::full_length () const
 void
 FFmpegContent::set_filters (vector<Filter const *> const & filters)
 {
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::FILTERS);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_filters = filters;
 	}
-
-	signal_changed (FFmpegContentProperty::FILTERS);
 }
 
 string
@@ -427,8 +437,8 @@ FFmpegContent::identifier () const
 		s += "_" + video->identifier();
 	}
 
-	if (only_caption() && only_caption()->use() && only_caption()->burn()) {
-		s += "_" + only_caption()->identifier();
+	if (only_text() && only_text()->use() && only_text()->burn()) {
+		s += "_" + only_text()->identifier();
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
@@ -480,7 +490,7 @@ FFmpegContent::set_default_colour_conversion ()
 }
 
 void
-FFmpegContent::add_properties (list<UserProperty>& p) const
+FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
 	Content::add_properties (p);
 
@@ -617,7 +627,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 	}
 
 	if (audio) {
-		audio->add_properties (p);
+		audio->add_properties (film, p);
 	}
 }
 
@@ -629,7 +639,8 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 void
 FFmpegContent::signal_subtitle_stream_changed ()
 {
-	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+	/* XXX: this is too late; really it should be before the change */
+	ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 vector<shared_ptr<FFmpegAudioStream> >