Basics of FFmpeg examiner works.

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

diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index 4ec0a3e96710bbc99ddda2330081ee23f3c5558a..61fd814362b41b2f0b61758752c6bd3fe28f834c 100644 (file)
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -19,18 +19,17 @@
 
 #include <boost/optional.hpp>
 #include "processor.h"
-#include "ffmpeg_compatibility.h"
 
-class Matcher : public AudioVideoProcessor
+class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink, public AudioSource, public VideoSource 
 {
 public:
        Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
-       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
-       void process_audio (boost::shared_ptr<AudioBuffers>);
+       void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+       void process_audio (boost::shared_ptr<const AudioBuffers>, double);
        void process_end ();
 
 private:
-       void fix_start (double);
+       void fix_start ();
        void match (double);
        void repeat_last_video ();
        
@@ -42,20 +41,35 @@ private:
        boost::optional<libdcp::Size> _size;
        boost::optional<int> _channels;
 
+       struct VideoRecord {
+               VideoRecord (boost::shared_ptr<const Image> i, bool s, boost::shared_ptr<Subtitle> u, double t)
+                       : image (i)
+                       , same (s)
+                       , subtitle (u)
+                       , time (t)
+               {}
+
+               boost::shared_ptr<const Image> image;
+               bool same;
+               boost::shared_ptr<Subtitle> subtitle;
+               double time;
+       };
+
        struct AudioRecord {
-               AudioRecord (boost::shared_ptr<AudioBuffers> a, double t)
+               AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
                        : audio (a)
                        , time (t)
                {}
                
-               boost::shared_ptr<AudioBuffers> audio;
+               boost::shared_ptr<const AudioBuffers> audio;
                double time;
        };
 
+       std::list<VideoRecord> _pending_video;
        std::list<AudioRecord> _pending_audio;
 
        boost::optional<double> _first_input;
-       boost::shared_ptr<Image> _last_image;
+       boost::shared_ptr<const Image> _last_image;
        boost::shared_ptr<Subtitle> _last_subtitle;
 
        bool _had_first_video;