Try to fix the filter / AVFrame ownership.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index ef1ab041a052589f003816e26b239dd4e2ef2a9b..6e4fd48c0019710a2632e921d35645efa119c239 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,10 +24,10 @@
 #include "stream.h"
 #include "decoder.h"
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+       VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
@@ -43,7 +43,7 @@ public:
 
        virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-       void set_progress () const;
+       void set_progress (Job *) const;
        
        int video_frame () const {
                return _video_frame;
@@ -65,9 +65,8 @@ protected:
        
        virtual PixelFormat pixel_format () const = 0;
 
-       void emit_video (boost::shared_ptr<Image>, double);
+       void emit_video (boost::shared_ptr<Image>, bool, double);
        void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       void repeat_last_video ();
 
        /** Subtitle stream to use when decoding */
        boost::shared_ptr<SubtitleStream> _subtitle_stream;
@@ -75,15 +74,10 @@ protected:
        std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
 private:
-       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
-
        int _video_frame;
        double _last_source_time;
        
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif