Some more tidying up.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index ea1899840a7252a6358c682a0a1e85167bb3c7bd..0f1432907fec5203f59ab54de62f5993786fbb6d 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,66 +17,41 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
-#include "stream.h"
 #include "decoder.h"
+#include "util.h"
+
+class VideoContent;
 
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
-
-       /** @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 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::shared_ptr<SubtitleStream>);
-
-       void set_progress () const;
-       
-       SourceFrame video_frame () const {
-               return _video_frame;
-       }
+       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
-       boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-               return _subtitle_stream;
-       }
+       /* Calls for VideoContent to find out about itself */
 
-       std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
-               return _subtitle_streams;
-       }
+       /** @return video frame rate second, or 0 if unknown */
+       virtual float video_frame_rate () const = 0;
+       /** @return video size in pixels */
+       virtual libdcp::Size video_size () const = 0;
+       /** @return length according to our content's header */
+       virtual ContentVideoFrame video_length () const = 0;
 
 protected:
        
-       virtual PixelFormat pixel_format () const = 0;
-
-       void emit_video (boost::shared_ptr<Image>);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       void repeat_last_video ();
+       void video (boost::shared_ptr<Image>, bool, Time);
+       void subtitle (boost::shared_ptr<TimedSubtitle>);
 
-       /** 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;
+       Time _next_video;
 
 private:
-       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-       SourceFrame _video_frame;
-
+       boost::shared_ptr<const VideoContent> _video_content;
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       FrameRateConversion _frame_rate_conversion;
+       bool _odd;
 };
 
 #endif