Fix reffing of the AVFrame output by the decoder.

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

diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index b94c28446a4d7f3b69a8ebe8c70204ecf34e3b67..21e42f53d1ee12a35010f60661f950a1dff0c755 100644 (file)
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -19,22 +19,44 @@
 
 #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 (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>);
+       Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
+       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 match (double);
+       void repeat_last_video ();
+       
        int _sample_rate;
        float _frames_per_second;
        int _video_frames;
        int64_t _audio_frames;
        boost::optional<AVPixelFormat> _pixel_format;
-       boost::optional<Size> _size;
+       boost::optional<libdcp::Size> _size;
        boost::optional<int> _channels;
+
+       struct AudioRecord {
+               AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
+                       : audio (a)
+                       , time (t)
+               {}
+               
+               boost::shared_ptr<const AudioBuffers> audio;
+               double time;
+       };
+
+       std::list<AudioRecord> _pending_audio;
+
+       boost::optional<double> _first_input;
+       boost::shared_ptr<const Image> _last_image;
+       boost::shared_ptr<Subtitle> _last_subtitle;
+
+       bool _had_first_video;
+       bool _had_first_audio;
 };