projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated nl_NL translation from Rob van Nieuwkerk.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.cc
diff --git
a/src/lib/image_examiner.cc
b/src/lib/image_examiner.cc
index e8db326c71b513e0389b7c55bb1a374fe79b8da3..376491738ef7b004fb2dd5d8dd37ef0c5bf9a96b 100644
(file)
--- a/
src/lib/image_examiner.cc
+++ b/
src/lib/image_examiner.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
@@
-24,7
+24,9
@@
#include "exceptions.h"
#include "config.h"
#include "cross.h"
#include "exceptions.h"
#include "config.h"
#include "cross.h"
-#include <dcp/xyz_frame.h>
+#include "compose.hpp"
+#include <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
#include <Magick++.h>
#include <iostream>
#include <Magick++.h>
#include <iostream>
@@
-40,20
+42,25
@@
ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
: _film (film)
, _image_content (content)
{
: _film (film)
, _image_content (content)
{
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_IMAGE_MAGICK
using namespace MagickCore;
#endif
boost::filesystem::path path = content->path(0).string ();
if (valid_j2k_file (path)) {
boost::uintmax_t size = boost::filesystem::file_size (path);
using namespace MagickCore;
#endif
boost::filesystem::path path = content->path(0).string ();
if (valid_j2k_file (path)) {
boost::uintmax_t size = boost::filesystem::file_size (path);
- uint8_t* buffer = new uint8_t[size];
- FILE* f = fopen_boost (path, "r");
+ FILE* f = fopen_boost (path, "rb");
if (!f) {
throw FileError ("Could not open file for reading", path);
}
if (!f) {
throw FileError ("Could not open file for reading", path);
}
+ uint8_t* buffer = new uint8_t[size];
fread (buffer, 1, size, f);
fclose (f);
fread (buffer, 1, size, f);
fclose (f);
- _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+ try {
+ _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+ } catch (dcp::DCPReadError& e) {
+ delete[] buffer;
+ throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
+ }
delete[] buffer;
} else {
Magick::Image* image = new Magick::Image (content->path(0).string());
delete[] buffer;
} else {
Magick::Image* image = new Magick::Image (content->path(0).string());
@@
-62,11
+69,9
@@
ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
}
if (content->still ()) {
}
if (content->still ()) {
- _video_length = Con
tentTime::from_seconds (Config::instance()->default_still_length
());
+ _video_length = Con
fig::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate
());
} else {
} else {
- _video_length = ContentTime::from_frames (
- _image_content->number_of_paths (), video_frame_rate().get_value_or (24)
- );
+ _video_length = _image_content->number_of_paths ();
}
}
}
}
@@
-76,9
+81,14
@@
ImageExaminer::video_size () const
return _video_size.get ();
}
return _video_size.get ();
}
-optional<
float
>
+optional<
double
>
ImageExaminer::video_frame_rate () const
{
ImageExaminer::video_frame_rate () const
{
+ if (_image_content->has_own_video_frame_rate()) {
+ /* The content already knows what frame rate it should be */
+ return _image_content->video_frame_rate();
+ }
+
/* Don't know */
/* Don't know */
- return optional<
float
> ();
+ return optional<
double
> ();
}
}