Change how video timing is done.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 2e0a980928ea99213e29d94255aa6a520e14de40..ecbbd5134adc7298ed2c48717151af4b25c0e66e 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -19,16 +19,16 @@
 */
 
 
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
 #include "image_content.h"
 #include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
 #include "video_content.h"
-#include "frame_interval_checker.h"
+#include "video_decoder.h"
 #include <boost/filesystem.hpp>
 #include <iostream>
 
@@ -74,11 +74,11 @@ ImageDecoder::pass ()
                        */
                        _image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
                } else {
-                       _image = make_shared<FFmpegImageProxy>(path, _image_content->video->range());
+                       _image = make_shared<FFmpegImageProxy>(path);
                }
        }
 
-       video->emit (film(), _image, _frame_video_position);
+       video->emit(film(), _image, dcpomatic::ContentTime::from_frames(_frame_video_position, _image_content->video_frame_rate().get_value_or(24)));
        ++_frame_video_position;
        return false;
 }