Fix deadlock.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index df06b7cd9ffa3bb5ca7bd6ab4783ca055ad4c50f..6e4fd48c0019710a2632e921d35645efa119c239 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef DVDOMATIC_VIDEO_DECODER_H
 #define DVDOMATIC_VIDEO_DECODER_H
 
@@ -5,56 +24,60 @@
 #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>, boost::shared_ptr<const Options>, Job *);
+       VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */
-       virtual Size native_size () const = 0;
+       virtual libdcp::Size native_size () const = 0;
+       /** @return length (in source video frames), according to our content's header */
+       virtual SourceFrame length () const = 0;
 
        virtual int time_base_numerator () const = 0;
        virtual int time_base_denominator () const = 0;
        virtual int sample_aspect_ratio_numerator () const = 0;
        virtual int sample_aspect_ratio_denominator () const = 0;
 
-       virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+       virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-       SourceFrame video_frame () const {
+       void set_progress (Job *) const;
+       
+       int video_frame () const {
                return _video_frame;
        }
 
-       boost::optional<SubtitleStream> subtitle_stream () const {
+       boost::shared_ptr<SubtitleStream> subtitle_stream () const {
                return _subtitle_stream;
        }
 
-       std::vector<SubtitleStream> subtitle_streams () const {
+       std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
        }
 
+       double last_source_time () const {
+               return _last_source_time;
+       }
+
 protected:
        
        virtual PixelFormat pixel_format () const = 0;
-       void set_progress () const;
 
-       void emit_video (boost::shared_ptr<Image>);
+       void emit_video (boost::shared_ptr<Image>, bool, double);
        void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       void repeat_last_video ();
 
-       boost::optional<SubtitleStream> _subtitle_stream;
-       std::vector<SubtitleStream> _subtitle_streams;
+       /** Subtitle stream to use when decoding */
+       boost::shared_ptr<SubtitleStream> _subtitle_stream;
+       /** Subtitle streams that this decoder's content has */
+       std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
 private:
-       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-       SourceFrame _video_frame;
-
+       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