X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=967522e3645166d8455b834060947d4b673db121;hp=fce90ad7bded1913f8bf0a93a5d62a93f85e32df;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=29fe2d3a4c347e15b987f9e61e56d22a21d4678f

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index fce90ad7b..967522e36 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -29,7 +30,6 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
-#include "safe_stringstream.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
@@ -98,7 +98,33 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 	}
 
 	_length = node->number_child<Frame> ("VideoLength");
-	_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+
+	if (version <= 34) {
+		/* Snapshot of the VideoFrameType enum at version 34 */
+		switch (node->number_child<int> ("VideoFrameType")) {
+		case 0:
+			_frame_type = VIDEO_FRAME_TYPE_2D;
+			break;
+		case 1:
+			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
+			break;
+		case 2:
+			_frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
+			break;
+		case 3:
+			_frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE;
+			break;
+		case 4:
+			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT;
+			break;
+		case 5:
+			_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT;
+			break;
+		}
+	} else {
+		_frame_type = string_to_video_frame_type (node->string_child ("VideoFrameType"));
+	}
+
 	_sample_aspect_ratio = node->optional_number_child<double> ("SampleAspectRatio");
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
@@ -186,7 +212,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
 	node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
 	node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
-	node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_frame_type)));
+	node->add_child("VideoFrameType")->add_child_text (video_frame_type_to_string (_frame_type));
 	if (_sample_aspect_ratio) {
 		node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
 	}
@@ -237,20 +263,25 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 string
 VideoContent::identifier () const
 {
-	SafeStringStream s;
-	s << crop().left
-	  << "_" << crop().right
-	  << "_" << crop().top
-	  << "_" << crop().bottom
-	  << "_" << scale().id()
-	  << "_" << _fade_in
-	  << "_" << _fade_out;
+	char buffer[256];
+	snprintf (
+		buffer, sizeof(buffer), "%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64,
+		crop().left,
+		crop().right,
+		crop().top,
+		crop().bottom,
+		scale().id().c_str(),
+		_fade_in,
+		_fade_out
+		);
+
+	string s (buffer);
 
 	if (colour_conversion()) {
-		s << "_" << colour_conversion().get().identifier ();
+		s += "_" + colour_conversion().get().identifier ();
 	}
 
-	return s.str ();
+	return s;
 }
 
 string
@@ -276,6 +307,7 @@ VideoContent::size_after_3d_split () const
 	dcp::Size const s = size ();
 	switch (frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
+	case VIDEO_FRAME_TYPE_3D:
 	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
 	case VIDEO_FRAME_TYPE_3D_LEFT:
 	case VIDEO_FRAME_TYPE_3D_RIGHT:
@@ -348,11 +380,11 @@ VideoContent::fade (Frame f) const
 string
 VideoContent::processing_description () const
 {
-	/* stringstream is OK here as this string is just for presentation to the user */
-	SafeStringStream d;
+	string d;
+	char buffer[256];
 
 	if (size().width && size().height) {
-		d << String::compose (
+		d += String::compose (
 			_("Content video is %1x%2"),
 			size_after_3d_split().width,
 			size_after_3d_split().height
@@ -362,21 +394,24 @@ VideoContent::processing_description () const
 		double ratio = size_after_3d_split().ratio ();
 
 		if (sample_aspect_ratio ()) {
-			d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+			snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get());
+			d += buffer;
 			ratio *= sample_aspect_ratio().get ();
 		}
 
-		d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
+		snprintf (buffer, sizeof(buffer), _("\nDisplay aspect ratio %.2f:1"), ratio);
+		d += buffer;
 	}
 
 	if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
 		dcp::Size cropped = size_after_crop ();
-		d << String::compose (
+		d += String::compose (
 			_("Cropped to %1x%2"),
 			cropped.width, cropped.height
 			);
 
-		d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n";
+		snprintf (buffer, sizeof(buffer), " (%.2f:1)\n", cropped.ratio());
+		d += buffer;
 	}
 
 	shared_ptr<const Film> film = _parent->film ();
@@ -384,32 +419,44 @@ VideoContent::processing_description () const
 	dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
 
 	if (scaled != size_after_crop ()) {
-		d << String::compose (
+		d += String::compose (
 			_("Scaled to %1x%2"),
 			scaled.width, scaled.height
 			);
 
-		d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), scaled.ratio());
+		d += buffer;
 	}
 
 	if (scaled != container_size) {
-		d << String::compose (
+		d += String::compose (
 			_("Padded with black to fit container %1 (%2x%3)"),
 			film->container()->nickname (),
 			container_size.width, container_size.height
 			);
 
-		d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), container_size.ratio());
+		d += buffer;
+	}
+
+	if (_parent->video_frame_rate()) {
+		double const vfr = _parent->video_frame_rate().get ();
+
+		snprintf (buffer, sizeof(buffer), _("Content frame rate %.4f\n"), vfr);
+		d += buffer;
+
+		FrameRateChange frc (vfr, film->video_frame_rate ());
+		d += frc.description () + "\n";
 	}
 
-	return d.str ();
+	return d;
 }
 
 void
 VideoContent::add_properties (list<UserProperty>& p) const
 {
-	p.push_back (UserProperty (_("Video"), _("Length"), raw_convert<string> (length ()), _("video frames")));
-	p.push_back (UserProperty (_("Video"), _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
+	p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), raw_convert<string> (length ()), _("video frames")));
+	p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
 }
 
 void