X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=0e782c9dbd5124100f2001590afdc69f5f29fb52;hb=df29125d2f63b5c2e36b373462eac9684d8046e4;hp=7416630c13799a47dd5ebeba7a90d4d9ad95c78d;hpb=406cf117093a42e9a6c994cc34719869eba77caa;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7416630c1..0e782c9db 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,9 +32,8 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
-#include "raw_convert.h"
 #include "subtitle_content.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>
@@ -58,6 +57,7 @@ using std::max;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::raw_convert;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
@@ -181,10 +181,10 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Con
 }
 
 void
-FFmpegContent::as_xml (xmlpp::Node* node) const
+FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("FFmpeg");
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 
 	if (video) {
 		video->as_xml (node);
@@ -222,10 +222,10 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 		node->add_child("FirstVideo")->add_child_text (raw_convert<string> (_first_video.get().get()));
 	}
 
-	node->add_child("ColorRange")->add_child_text (raw_convert<string> (_color_range));
-	node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (_color_primaries));
-	node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (_color_trc));
-	node->add_child("Colorspace")->add_child_text (raw_convert<string> (_colorspace));
+	node->add_child("ColorRange")->add_child_text (raw_convert<string> (static_cast<int> (_color_range)));
+	node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (static_cast<int> (_color_primaries)));
+	node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (static_cast<int> (_color_trc)));
+	node->add_child("Colorspace")->add_child_text (raw_convert<string> (static_cast<int> (_colorspace)));
 	if (_bits_per_pixel) {
 		node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (_bits_per_pixel.get ()));
 	}
@@ -388,29 +388,27 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 string
 FFmpegContent::identifier () const
 {
-	SafeStringStream s;
-
-	s << Content::identifier();
+	string s = Content::identifier();
 
 	if (video) {
-		s << "_" << video->identifier();
+		s += "_" + video->identifier();
 	}
 
 	if (subtitle) {
-		s << "_" << subtitle->identifier();
+		s += "_" + subtitle->identifier();
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_subtitle_stream) {
-		s << "_" << _subtitle_stream->identifier ();
+		s += "_" + _subtitle_stream->identifier ();
 	}
 
 	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		s << "_" << (*i)->id ();
+		s += "_" + (*i)->id ();
 	}
 
-	return s.str ();
+	return s;
 }
 
 list<ContentTimePeriod>
@@ -519,10 +517,12 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 			_("SMPTE 240M"),
 			_("Film"),
 			_("BT2020"),
-			_("SMPTE ST 428-1 (CIE 1931 XYZ)")
+			_("SMPTE ST 428-1 (CIE 1931 XYZ)"),
+			_("SMPTE ST 431-2 (2011)"),
+			_("SMPTE ST 432-1 D65 (2010)")
 		};
 
-		DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
+		DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 13);
 		p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries]));
 
 		char const * transfers[] = {
@@ -543,10 +543,11 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 			_("BT2020 for a 10-bit system"),
 			_("BT2020 for a 12-bit system"),
 			_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
-			_("SMPTE ST 428-1")
+			_("SMPTE ST 428-1"),
+			_("ARIB STD-B67 ('Hybrid log-gamma')")
 		};
 
-		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
+		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19);
 		p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
 
 		char const * spaces[] = {
@@ -561,13 +562,14 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 			_("YCOCG"),
 			_("BT2020 non-constant luminance"),
 			_("BT2020 constant luminance"),
+			_("SMPTE 2085, Y'D'zD'x"),
 		};
 
-		DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
+		DCPOMATIC_ASSERT (AVCOL_SPC_NB == 12);
 		p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace]));
 
 		if (_bits_per_pixel) {
-			p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
+			p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), _bits_per_pixel.get ()));
 		}
 	}
 
@@ -600,3 +602,12 @@ FFmpegContent::ffmpeg_audio_streams () const
 
 	return fa;
 }
+
+void
+FFmpegContent::use_template (shared_ptr<const Content> c)
+{
+	Content::use_template (c);
+
+	shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (c);
+	_filters = fc->_filters;
+}