Mostly-merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index df06b7cd9ffa3bb5ca7bd6ab4783ca055ad4c50f..c3228e88dac3fb2fcb633c32b752f8e7a8676f61 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,60 +1,48 @@
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-#include "video_source.h"
-#include "stream.h"
-#include "decoder.h"
+    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.
 
-class VideoDecoder : public VideoSource, public virtual Decoder
-{
-public:
-       VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+    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.
 
-       /** @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;
+    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.
 
-       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>);
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
-       SourceFrame video_frame () const {
-               return _video_frame;
-       }
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
+#include "decoder.h"
+#include "video_content.h"
+#include "util.h"
+#include "decoded.h"
 
-       boost::optional<SubtitleStream> subtitle_stream () const {
-               return _subtitle_stream;
-       }
+class VideoContent;
+class Image;
+
+class VideoDecoder : public virtual Decoder
+{
+public:
+       VideoDecoder (boost::shared_ptr<const VideoContent>);
 
-       std::vector<SubtitleStream> subtitle_streams () const {
-               return _subtitle_streams;
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
        }
 
 protected:
-       
-       virtual PixelFormat pixel_format () const = 0;
-       void set_progress () const;
-
-       void emit_video (boost::shared_ptr<Image>);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       void repeat_last_video ();
-
-       boost::optional<SubtitleStream> _subtitle_stream;
-       std::vector<SubtitleStream> _subtitle_streams;
-
-private:
-       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-       SourceFrame _video_frame;
-
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       void video (boost::shared_ptr<const Image>, bool, ContentTime);
+       boost::shared_ptr<const VideoContent> _video_content;
 };
 
 #endif