/*
- 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 "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 <dcp/j2k.h>
#include <Magick++.h>
#include <iostream>
: _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);
- 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);
}
+ uint8_t* buffer = new uint8_t[size];
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());
}
if (content->still ()) {
- _video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
+ _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate ());
} else {
- _video_length = ContentTime::from_frames (
- _image_content->number_of_paths (), video_frame_rate().get_value_or (0)
- );
+ _video_length = _image_content->number_of_paths ();
}
}
return _video_size.get ();
}
-optional<float>
+optional<double>
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 */
- return optional<float> ();
+ return optional<double> ();
+}
+
+bool
+ImageExaminer::yuv () const
+{
+ /* We never convert ImageSource from YUV to RGB (though maybe sometimes we should)
+ so it makes sense to just say they are never YUV so the option of a conversion
+ to RGB is not offered.
+ */
+ return false;
}