Fix the build for older macOS.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 79c9f727ceed7ba710546cb8d4292eb0f58a4df5..ae12d7adb3570363304326250fe55474b3827039 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,22 +1,24 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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 "image_content.h"
 #include "image_examiner.h"
 #include "film.h"
@@ -24,65 +26,84 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include "compose.hpp"
+#include "ffmpeg_image_proxy.h"
+#include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <Magick++.h>
+#include <dcp/j2k_transcode.h>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::list;
 using std::sort;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
+
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _film (film)
        , _image_content (content)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
-       using namespace MagickCore;
-#endif
-       boost::filesystem::path path = content->path(0).string ();
+       auto path = content->path(0);
        if (valid_j2k_file (path)) {
-               boost::uintmax_t size = boost::filesystem::file_size (path);
-               FILE* f = fopen_boost (path, "rb");
+               auto size = boost::filesystem::file_size (path);
+               auto 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);
+               auto buffer = new uint8_t[size];
+               checked_fread (buffer, size, f, path);
                fclose (f);
                try {
                        _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
-               } catch (dcp::DCPReadError& e) {
+               } catch (dcp::ReadError& 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;
+               FFmpegImageProxy proxy(content->path(0));
+               _video_size = proxy.image(Image::Alignment::COMPACT).image->size();
        }
 
        if (content->still ()) {
-               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
+               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate ());
        } else {
                _video_length = _image_content->number_of_paths ();
        }
 }
 
+
 dcp::Size
 ImageExaminer::video_size () const
 {
        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 {};
+}
+
+
+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;
 }