Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / image_examiner.cc

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 47b220da7b2161869f4d35ba37bd487ba63446dc..7a93b5cd1439a9bfa0757d6946e965ffa32c5788 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -17,15 +17,18 @@
 
 */
 
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <Magick++.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "film.h"
 #include "job.h"
 #include "exceptions.h"
 #include "config.h"
+#include "cross.h"
+#include "compose.hpp"
+#include <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
+#include <Magick++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -33,21 +36,40 @@ using std::cout;
 using std::list;
 using std::sort;
 using boost::shared_ptr;
-using boost::lexical_cast;
-using boost::bad_lexical_cast;
+using boost::optional;
 
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _film (film)
        , _image_content (content)
-       , _video_length (0)
 {
+#ifdef DCPOMATIC_IMAGE_MAGICK
        using namespace MagickCore;
-       Magick::Image* image = new Magick::Image (content->path(0).string());
-       _video_size = dcp::Size (image->columns(), image->rows());
-       delete image;
+#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, "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);
+               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());
+               _video_size = dcp::Size (image->columns(), image->rows());
+               delete image;
+       }
 
        if (content->still ()) {
-               _video_length = Config::instance()->default_still_length() * video_frame_rate();
+               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
        } else {
                _video_length = _image_content->number_of_paths ();
        }
@@ -59,13 +81,14 @@ ImageExaminer::video_size () const
        return _video_size.get ();
 }
 
-float
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
-       boost::shared_ptr<const Film> f = _film.lock ();
-       if (!f) {
-               return 24;
+       if (_image_content->video_frame_rate() != 0) {
+               /* The content already knows what frame rate it should be */
+               return _image_content->video_frame_rate();
        }
 
-       return f->video_frame_rate ();
+       /* Don't know */
+       return optional<double> ();
 }