X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=d67592ed812544c644b8766bcb1b1be1c03e84de;hb=8b842865451795d5e8f8b39691c210de1ed5dd4f;hp=71dfed1e0c7768aea8ca99a042e3362361edacd0;hpb=17cea71c34ed6bdba67aac8614572c7511844c2a;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 71dfed1e0..d67592ed8 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 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
@@ -21,113 +21,36 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "util.h"
-#include "stream.h"
-#include "video_source.h"
-#include "audio_source.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
 
-class Job;
-class Options;
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
 class Film;
-class FilterGraph;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
- *
- *  These classes can be instructed run through their content
- *  (by calling ::go), and they emit signals when video or audio data is ready for something else
- *  to process.
  */
-class Decoder : public VideoSource, public AudioSource
+class Decoder : public boost::noncopyable
 {
 public:
-	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	/* Methods to query our input video */
-
-	/** @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 bool pass () = 0;
-	void go ();
-
-	SourceFrame video_frame () const {
-		return _video_frame;
-	}
-
-	virtual void set_audio_stream (boost::optional<AudioStream>);
-	virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
-
-	boost::optional<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
-
-	boost::optional<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
-
-	std::vector<AudioStream> audio_streams () const {
-		return _audio_streams;
-	}
-	
-	std::vector<SubtitleStream> subtitle_streams () const {
-		return _subtitle_streams;
-	}
+	/** Perform one decode pass of the content, which may or may not
+	 *  cause the object to emit some data.
+	 */
+	virtual void pass () = 0;
+	virtual bool done () const = 0;
 
 protected:
-	
-	virtual PixelFormat pixel_format () const = 0;
-	
-	void process_video (AVFrame *);
-	void process_audio (boost::shared_ptr<AudioBuffers>);
-	void process_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
-
-	/** our Film */
-	boost::shared_ptr<Film> _film;
-	/** our options */
-	boost::shared_ptr<const Options> _opt;
-	/** associated Job, or 0 */
-	Job* _job;
-
-	boost::optional<AudioStream> _audio_stream;
-	boost::optional<SubtitleStream> _subtitle_stream;
 
-	std::vector<AudioStream> _audio_streams;
-	std::vector<SubtitleStream> _subtitle_streams;
+	virtual void flush () {};
 	
-private:
-	void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
-	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
-
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
+	/** The Film that we are decoding in */
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif