X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=5cf4704ea73585f4bcb306cfcfa82d7dec861e12;hb=6154d5f85664a26e9490c9120bef5e742af94490;hp=8e07174e34016b3b7a008d4958a2bbd55046365d;hpb=58f0530b1687673ea6e24a083063c3fdf2bff0b2;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 8e07174e3..5cf4704ea 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -17,10 +17,6 @@
 
 */
 
-#include <iomanip>
-#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
@@ -33,6 +29,10 @@
 #include "frame_rate_change.h"
 #include "log.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <iomanip>
 
 #include "i18n.h"
 
@@ -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) {
@@ -221,14 +221,15 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 {
 	/* These examiner calls could call other content methods which take a lock on the mutex */
 	dcp::Size const vs = d->video_size ();
-	float const vfr = d->video_frame_rate ();
+	optional<float> const vfr = d->video_frame_rate ();
 	ContentTime vl = d->video_length ();
 	optional<float> const ar = d->sample_aspect_ratio ();
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_size = vs;
-		_video_frame_rate = vfr;
+		/* Default video frame rate to 24fps if the examiner doesn't know */
+		_video_frame_rate = vfr.get_value_or (24);
 		_video_length = vl;
 		_sample_aspect_ratio = ar;
 
@@ -239,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);
@@ -248,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)
 {
@@ -412,7 +389,7 @@ VideoContent::video_size_after_3d_split () const
 		return dcp::Size (s.width, s.height / 2);
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 }
 
 void
@@ -473,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()));
 }
 
@@ -481,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 ()));
 
@@ -494,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 ()));
 
@@ -521,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 ());
@@ -562,7 +539,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);