X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0901f73b020027cc733ab325c2085f494db65d45;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=8d087b6ee00c338413948d5f6b499d132a15775e;hpb=4e5a8ec686e3fda5c550cf535cb1e0037ea7ec71;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 8d087b6ee..0901f73b0 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,114 +21,56 @@
  *  @brief Parent class for decoders of content.
  */
 
-#include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
-#include "film.h"
-#include "format.h"
-#include "job.h"
-#include "options.h"
-#include "exceptions.h"
-#include "image.h"
-#include "util.h"
-#include "log.h"
 #include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
-
-using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
+#include "decoded.h"
+
+#include "i18n.h"
+
+using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
-/** @param f Film.
- *  @param o Options.
- *  @param j Job that we are running within, or 0
+/** @param o Decode options.
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j)
-	: _film (f)
-	, _opt (o)
-	, _job (j)
-	, _video_frame (0)
+Decoder::Decoder ()
+	: _done (false)
 {
-	
-}
 
-/** Start decoding */
-void
-Decoder::go ()
-{
-	if (_job && !_film->dcp_length()) {
-		_job->set_progress_unknown ();
-	}
-
-	while (pass () == false) {
-		if (_job && _film->dcp_length()) {
-			_job->set_progress (float (_video_frame) / _film->length().get());
-		}
-	}
 }
 
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
- *  @param frame to decode; caller manages memory.
- */
-void
-Decoder::emit_video (shared_ptr<Image> image)
+struct DecodedSorter
 {
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) {
-		sub = _timed_subtitle->subtitle ();
+	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
+	{
+		return a->dcp_time < b->dcp_time;
 	}
+};
 
-	signal_video (image, sub);
-}
-
-void
-Decoder::repeat_last_video ()
+shared_ptr<Decoded>
+Decoder::peek ()
 {
-	if (!_last_image) {
-		_last_image.reset (new CompactImage (pixel_format(), native_size()));
-		_last_image->make_black ();
+	while (!_done && _pending.empty ()) {
+		_done = pass ();
 	}
 
-	signal_video (_last_image, _last_subtitle);
-}
-
-void
-Decoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
-{
-	TIMING ("Decoder emits %1", _video_frame);
-	Video (image, sub);
-	++_video_frame;
+	if (_done && _pending.empty ()) {
+		return shared_ptr<Decoded> ();
+	}
 
-	_last_image = image;
-	_last_subtitle = sub;
+	_pending.sort (DecodedSorter ());
+	return _pending.front ();
 }
 
 void
-Decoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+Decoder::consume ()
 {
-	_timed_subtitle = s;
-	
-	if (_timed_subtitle && _opt->apply_crop) {
-		Position const p = _timed_subtitle->subtitle()->position ();
-		_timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
+	if (!_pending.empty ()) {
+		_pending.pop_front ();
 	}
 }
 
 void
-Decoder::set_audio_stream (optional<AudioStream> s)
-{
-	_audio_stream = s;
-}
-
-void
-Decoder::set_subtitle_stream (optional<SubtitleStream> s)
+Decoder::seek (ContentTime, bool)
 {
-	_subtitle_stream = s;
+	_pending.clear ();
+	_done = false;
 }