projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deadlock.
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 70d777bca11f6e52a466dbf44414b7a1ab048163..f9a772e00126c5d49162442ff68c5559820764bb 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-25,24
+25,33
@@
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
+#include "safe_stringstream.h"
#include "i18n.h"
#include "i18n.h"
+#include "image_filename_sorter.cc"
+
using std::string;
using std::cout;
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)
{
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);
_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 ());
} 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;
+ }
}
}
}
}
@@
-50,7
+59,12
@@
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
throw FileError (_("No valid image files were found in the folder."), p);
}
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);
}
}
}
}
@@
-102,11
+116,10
@@
ImageContent::as_xml (xmlpp::Node* node) const
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);
+
DCPOMATIC_ASSERT
(film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
take_from_video_examiner (examiner);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
take_from_video_examiner (examiner);
@@
-127,14
+140,14
@@
DCPTime
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
-
assert
(film);
+
DCPOMATIC_ASSERT
(film);
return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
string
ImageContent::identifier () const
{
return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}
string
ImageContent::identifier () const
{
-
strings
tream s;
+
SafeStringS
tream s;
s << VideoContent::identifier ();
s << "_" << video_length().get();
return s.str ();
s << VideoContent::identifier ();
s << "_" << video_length().get();
return s.str ();