diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-21 17:38:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-21 17:38:50 +0100 |
| commit | f1bf21a9c2581591ab80bfc997a22b93046f8c56 (patch) | |
| tree | 7c0db304d310e656fcaf4766a6c3b27e98df25b1 /src/lib/imagemagick_decoder.cc | |
| parent | 01791aac0b11e9f296cd31a7803e287203bd8355 (diff) | |
Split examiner parts off decoder.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 077d0174d..c9123c77c 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2013 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 @@ -35,41 +35,11 @@ using libdcp::Size; ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c) : Decoder (f) , VideoDecoder (f, c) - , _imagemagick_content (c) + , ImageMagick (c) { } -libdcp::Size -ImageMagickDecoder::video_size () const -{ - if (!_video_size) { - using namespace MagickCore; - Magick::Image* image = new Magick::Image (_imagemagick_content->file().string()); - _video_size = libdcp::Size (image->columns(), image->rows()); - delete image; - } - - return _video_size.get (); -} - -int -ImageMagickDecoder::video_length () const -{ - return _imagemagick_content->video_length (); -} - -float -ImageMagickDecoder::video_frame_rate () const -{ - boost::shared_ptr<const Film> f = _film.lock (); - if (!f) { - return 24; - } - - return f->dcp_video_frame_rate (); -} - void ImageMagickDecoder::pass () { |