X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=e1106f86d08f616455aa2323180d80212c4f6b3c;hb=a70ec9be6a312c63e7655b3a266cbf353e8e1795;hp=2f7416c62630eaf740e4039532d71fb87e9d6ea4;hpb=e52d9526f0a49acb72e8b4aa980399b119171ba5;p=dcpomatic.git diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index 2f7416c62..e1106f86d 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -18,6 +18,7 @@ */ + #include "image_content.h" #include "image_decoder.h" #include "video_decoder.h" @@ -33,20 +34,22 @@ #include "i18n.h" + using std::cout; using std::make_shared; using std::shared_ptr; using dcp::Size; using namespace dcpomatic; + ImageDecoder::ImageDecoder (shared_ptr film, shared_ptr c) : Decoder (film) , _image_content (c) - , _frame_video_position (0) { video = make_shared(this, c); } + bool ImageDecoder::pass () { @@ -71,7 +74,7 @@ ImageDecoder::pass () */ _image = make_shared(path, _image_content->video->size(), pf); } else { - _image = make_shared(path, _image_content->video->range()); + _image = make_shared(path); } } @@ -80,6 +83,7 @@ ImageDecoder::pass () return false; } + void ImageDecoder::seek (ContentTime time, bool accurate) {