projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move video frame rate ('prepared-for') into Content.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index acaedf0505d746b71661d89581192f7ef52d86ec..57212c589155e699d93a5528d7a02dd5d294dbb4 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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
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,27
+17,33
@@
*/
*/
-#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_content.h"
+#include "video_content.h"
#include "image_examiner.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
#include "image_examiner.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#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"
using std::string;
using std::cout;
#include "i18n.h"
using std::string;
using std::cout;
-using std::stringstream;
using boost::shared_ptr;
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) {
_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);
}
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
}
string
@@
-80,7
+87,7
@@
string
ImageContent::technical_summary () const
{
string s = Content::technical_summary() + " - "
ImageContent::technical_summary () const
{
string s = Content::technical_summary() + " - "
- +
VideoContent::
technical_summary() + " - ";
+ +
video->
technical_summary() + " - ";
if (still ()) {
s += _("still");
if (still ()) {
s += _("still");
@@
-96,49
+103,38
@@
ImageContent::as_xml (xmlpp::Node* node) const
{
node->add_child("Type")->add_child_text ("Image");
Content::as_xml (node);
{
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)
{
}
void
ImageContent::examine (shared_ptr<Job> job)
{
- job->sub (_("Computing digest"));
Content::examine (job);
shared_ptr<const Film> film = _film.lock ();
Content::examine (job);
shared_ptr<const Film> film = _film.lock ();
- assert (film);
-
- shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
- take_from_video_examiner (examiner);
- set_video_length (examiner->video_length ());
-}
+ DCPOMATIC_ASSERT (film);
-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_examiner (examiner);
+ set_default_colour_conversion ();
}
DCPTime
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
}
DCPTime
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 (active_video_frame_rate(), film->video_frame_rate());
+ return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
}
string
ImageContent::identifier () const
{
}
string
ImageContent::identifier () const
{
- stringstream s;
- s << VideoContent::identifier ();
- s << "_" << video_length().get();
+ SafeStringStream s;
+ s << Content::identifier();
+ s << "_" << video->identifier ();
+ s << "_" << video->length();
return s.str ();
}
return s.str ();
}
@@
-149,17
+145,23
@@
ImageContent::still () const
}
void
}
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;
}
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);
+ }
+}