/*
- 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#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_HAVE_MAGICKCORE_NAMESPACE
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);
- FILE* f = fopen_boost (path, "r");
+ FILE* f = fopen_boost (path, "rb");
if (!f) {
throw FileError ("Could not open file for reading", path);
}
}
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 (24)
- );
+ _video_length = _image_content->number_of_paths ();
}
}
return _video_size.get ();
}
-optional<float>
+optional<double>
ImageExaminer::video_frame_rate () const
{
+ if (_image_content->video_frame_rate()) {
+ /* The content already knows what frame rate it should be */
+ return _image_content->video_frame_rate().get();
+ }
+
/* 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;
}