/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
#include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
+#include <boost/optional.hpp>
#include <iostream>
using std::cout;
using boost::optional;
-void
-Decoder::maybe_seek (optional<ContentTime>& position, ContentTime time, bool accurate)
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
{
- if (position && (time >= *position && time < (*position + ContentTime::from_seconds(1)))) {
- /* No need to seek: caller should just pass() */
- return;
+ optional<ContentTime> pos;
+
+ if (video && (!pos || video->position() < *pos)) {
+ pos = video->position();
+ }
+
+ if (audio && (!pos || audio->position() < *pos)) {
+ pos = audio->position();
+ }
+
+ if (subtitle && (!pos || subtitle->position() < *pos)) {
+ pos = subtitle->position();
}
- position.reset ();
- seek (time, accurate);
+ return pos.get_value_or(ContentTime());
+}
+
+void
+Decoder::seek (ContentTime, bool)
+{
+ if (audio) {
+ audio->seek ();
+ }
+ if (subtitle) {
+ subtitle->seek ();
+ }
}