/*
- 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
#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_examiner.h"
-#include "config.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
+#include "frame_rate_change.h"
+#include "exceptions.h"
+#include "safe_stringstream.h"
#include "i18n.h"
+#include "image_filename_sorter.cc"
+
using std::string;
using std::cout;
-using std::stringstream;
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f)
, VideoContent (f)
{
- if (boost::filesystem::is_regular_file (p)) {
+ bool have_j2k = false;
+ if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
_paths.push_back (p);
+ if (valid_j2k_file (p)) {
+ have_j2k = true;
+ }
} else {
for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
_paths.push_back (i->path ());
+ if (valid_j2k_file (i->path ())) {
+ have_j2k = true;
+ }
}
}
throw FileError (_("No valid image files were found in the folder."), p);
}
- sort (_paths.begin(), _paths.end());
+ sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+ }
+
+ if (have_j2k) {
+ /* We default to no colour conversion if we have JPEG2000 files */
+ unset_colour_conversion (false);
}
}
void
ImageContent::examine (shared_ptr<Job> job)
{
- job->sub (_("Computing digest"));
Content::examine (job);
shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ DCPOMATIC_ASSERT (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
take_from_video_examiner (examiner);
- set_video_length (examiner->video_length ());
}
void
-ImageContent::set_video_length (ContentTime len)
+ImageContent::set_video_length (Frame len)
{
{
boost::mutex::scoped_lock lm (_mutex);
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
- assert (film);
- return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+ DCPOMATIC_ASSERT (film);
+ FrameRateChange const frc (video_frame_rate(), film->video_frame_rate());
+ return DCPTime::from_frames (rint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
}
string
ImageContent::identifier () const
{
- stringstream s;
+ SafeStringStream s;
s << VideoContent::identifier ();
- s << "_" << video_length().get();
+ s << "_" << video_length();
return s.str ();
}
signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
}
+void
+ImageContent::set_default_colour_conversion ()
+{
+ bool const s = still ();
+
+ boost::mutex::scoped_lock lm (_mutex);
+
+ if (s) {
+ _colour_conversion = PresetColourConversion::from_id ("srgb").conversion;
+ } else {
+ _colour_conversion = PresetColourConversion::from_id ("rec709").conversion;
+ }
+}