X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=5dc9e3d66814424f4dee8eed190e30a52cb75437;hb=1b6a26c3b1387026f68c5cb72f3da21370595f2d;hp=1da5d87c16778046c1720c972c783000ae4bd559;hpb=91f71a29f894c382a7f92cf5fdcb75d9849e2aa7;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1da5d87c1..5dc9e3d66 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -123,7 +123,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 
 	
 	if (node->optional_node_child ("ColourConversion")) {
-		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
 	}
 	if (version >= 32) {
 		_fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
@@ -136,7 +136,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
 	, _video_length (0)
 {
 	shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
-	assert (ref);
+	DCPOMATIC_ASSERT (ref);
 
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
@@ -208,7 +208,7 @@ VideoContent::set_default_colour_conversion (bool signal)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+		_colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ());
 	}
 
 	if (signal) {
@@ -240,7 +240,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	}
 
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 	LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
 	
 	signal_changed (VideoContentProperty::VIDEO_SIZE);
@@ -249,30 +249,6 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	signal_changed (ContentProperty::LENGTH);
 }
 
-
-string
-VideoContent::information () const
-{
-	if (video_size().width == 0 || video_size().height == 0) {
-		return "";
-	}
-	
-	SafeStringStream s;
-
-	s << String::compose (
-		_("%1x%2 pixels (%3:1)"),
-		video_size().width,
-		video_size().height,
-		setprecision (3), video_size().ratio ()
-		);
-
-	if (sample_aspect_ratio ()) {
-		s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ());
-	}
-	
-	return s.str ();
-}
-
 void
 VideoContent::set_left_crop (int c)
 {
@@ -383,7 +359,7 @@ string
 VideoContent::technical_summary () const
 {
 	string s = String::compose (
-		"video: length %1, size %2x%3, rate %4",
+		N_("video: length %1, size %2x%3, rate %4"),
 		video_length_after_3d_combine().seconds(),
 		video_size().width,
 		video_size().height,
@@ -391,7 +367,7 @@ VideoContent::technical_summary () const
 		);
 
 	if (sample_aspect_ratio ()) {
-		s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+		s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
 	}
 
 	return s;
@@ -413,7 +389,7 @@ VideoContent::video_size_after_3d_split () const
 		return dcp::Size (s.width, s.height / 2);
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 }
 
 void
@@ -474,7 +450,7 @@ ContentTime
 VideoContent::dcp_time_to_content_time (DCPTime t) const
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 	return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
@@ -482,7 +458,7 @@ void
 VideoContent::scale_and_crop_to_fit_width ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 
 	set_scale (VideoContentScale (film->container ()));
 
@@ -495,7 +471,7 @@ void
 VideoContent::scale_and_crop_to_fit_height ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 
 	set_scale (VideoContentScale (film->container ()));
 
@@ -522,7 +498,7 @@ VideoContent::set_video_frame_rate (float r)
 optional<float>
 VideoContent::fade (VideoFrame f) const
 {
-	assert (f >= 0);
+	DCPOMATIC_ASSERT (f >= 0);
 	
 	if (f < fade_in().frames (video_frame_rate ())) {
 		return float (f) / _fade_in.frames (video_frame_rate ());
@@ -549,7 +525,15 @@ VideoContent::processing_description () const
 			video_size_after_3d_split().height
 			);
 
-		d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+
+		float ratio = video_size_after_3d_split().ratio ();
+
+		if (sample_aspect_ratio ()) {
+			d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+			ratio *= sample_aspect_ratio().get ();
+		}
+
+		d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
 	}
 
 	if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
@@ -563,7 +547,7 @@ VideoContent::processing_description () const
 	}
 
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 
 	dcp::Size const container_size = film->frame_size ();
 	dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size, 1);
@@ -594,3 +578,4 @@ VideoContent::processing_description () const
 
 	return d.str ();
 }
+