X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=231eb9f8c163c117c5b88941f9c52350613e1554;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=b8d2a6921c3df204e161a07835273b50a913c8fd;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index b8d2a6921..231eb9f8c 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_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
@@ -17,8 +17,8 @@
 
 */
 
-#include <libcxml/cxml.h>
 #include "image_content.h"
+#include "video_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
 #include "film.h"
@@ -26,6 +26,11 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include "image_filename_sorter.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -33,11 +38,12 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
-	: Content (f)
-	, VideoContent (f)
+ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
+	: Content (film)
 {
-	if (boost::filesystem::is_regular_file (p)) {
+	video.reset (new VideoContent (this, film));
+
+	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
 	} else {
 		for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
@@ -49,17 +55,18 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 		if (_paths.empty()) {
 			throw FileError (_("No valid image files were found in the folder."), p);
 		}
-		       		
-		sort (_paths.begin(), _paths.end());
+
+		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
 	}
+
+	set_default_colour_conversion ();
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-	: Content (f, node)
-	, VideoContent (f, node, version)
+ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+	: Content (film, node)
 {
-	
+	video.reset (new VideoContent (this, film, node, version));
 }
 
 string
@@ -80,7 +87,7 @@ string
 ImageContent::technical_summary () const
 {
 	string s = Content::technical_summary() + " - "
-		+ VideoContent::technical_summary() + " - ";
+		+ video->technical_summary() + " - ";
 
 	if (still ()) {
 		s += _("still");
@@ -96,30 +103,20 @@ ImageContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Image");
 	Content::as_xml (node);
-	VideoContent::as_xml (node);
+	video->as_xml (node);
 }
 
 void
-ImageContent::examine (shared_ptr<Job> job, bool calculate_digest)
+ImageContent::examine (shared_ptr<Job> job)
 {
-	Content::examine (job, calculate_digest);
+	Content::examine (job);
 
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	
-	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-	take_from_video_examiner (examiner);
-}
-
-void
-ImageContent::set_video_length (ContentTime len)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_video_length = len;
-	}
 
-	signal_changed (ContentProperty::LENGTH);
+	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
+	video->take_from_video_examiner (examiner);
+	set_default_colour_conversion ();
 }
 
 DCPTime
@@ -127,15 +124,17 @@ ImageContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+	FrameRateChange const frc (video->video_frame_rate(), film->video_frame_rate());
+	return DCPTime::from_frames (llrint (video->video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
 }
 
 string
 ImageContent::identifier () const
 {
 	SafeStringStream s;
-	s << VideoContent::identifier ();
-	s << "_" << video_length().get();
+	s << Content::identifier();
+	s << "_" << video->identifier ();
+	s << "_" << video->video_length();
 	return s.str ();
 }
 
@@ -146,17 +145,23 @@ ImageContent::still () const
 }
 
 void
-ImageContent::set_video_frame_rate (float r)
+ImageContent::set_default_colour_conversion ()
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_video_frame_rate == r) {
+	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+		if (valid_j2k_file (i)) {
+			/* We default to no colour conversion if we have JPEG2000 files */
+			video->unset_colour_conversion ();
 			return;
 		}
-		
-		_video_frame_rate = r;
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
 
+	bool const s = still ();
+
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if (s) {
+		video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion);
+	} else {
+		video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
+	}
+}