Another attempt to fix back / same-frame seeks.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ce2550d12d8f2ca4059d3f5860402482d1e1c65e..46c8efdeb39420bbd2439c36ad3b332a020160a4 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,9 +21,9 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
 
-class VideoDecoder;
+class VideoExaminer;
+class Ratio;
 
 class VideoContentProperty
 {
@@ -31,20 +31,24 @@ public:
        static int const VIDEO_SIZE;
        static int const VIDEO_FRAME_RATE;
        static int const VIDEO_CROP;
+       static int const VIDEO_RATIO;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-       VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+       typedef int Frame;
+
+       VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
        VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
        VideoContent (VideoContent const &);
 
        void as_xml (xmlpp::Node *) const;
        virtual std::string information () const;
+       virtual std::string identifier () const;
 
-       ContentVideoFrame video_length () const {
+       VideoContent::Frame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
@@ -70,15 +74,25 @@ public:
                return _crop;
        }
 
+       void set_ratio (Ratio const *);
+
+       Ratio const * ratio () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _ratio;
+       }
+
 protected:
-       void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
+       void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       ContentVideoFrame _video_length;
+       VideoContent::Frame _video_length;
 
 private:
+       friend class ffmpeg_pts_offset_test;
+       
        libdcp::Size _video_size;
        float _video_frame_rate;
        Crop _crop;
+       Ratio const * _ratio;
 };
 
 #endif