projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 30244b40b5eae2591bbde3301e4ddb5e3f033f20..0d4f4babfa9db0831650529ae4ead927260dc7f3 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-1,70
+1,61
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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.
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.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
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.
You should have received a copy of the GNU General Public License
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.
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.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-/** @file src/decoder.cc
- * @brief Parent class for decoders of content.
- */
-
-#include "film.h"
#include "decoder.h"
#include "decoder.h"
-#include "decoded.h"
-
-#include "i18n.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
+#include <boost/optional.hpp>
+#include <iostream>
using std::cout;
using std::cout;
-using boost::
shared_ptr
;
+using boost::
optional
;
-/** @param f Film.
- * @param o Decode options.
- */
-Decoder::Decoder (shared_ptr<const Film> f)
- : _film (f)
- , _done (false)
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
{
{
+ optional<ContentTime> pos;
-}
-
-shared_ptr<Decoded>
-Decoder::peek ()
-{
- while (!_done && _pending.empty ()) {
- _done = pass ();
+ if (video && !video->ignore() && (!pos || video->position() < *pos)) {
+ pos = video->position();
}
}
- if (
_done && _pending.empty (
)) {
-
return shared_ptr<Decoded>
();
+ if (
audio && !audio->ignore() && (!pos || audio->position() < *pos
)) {
+
pos = audio->position
();
}
}
- return _pending.front ();
-}
-
-void
-Decoder::consume ()
-{
- if (!_pending.empty ()) {
- _pending.pop_front ();
+ if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) {
+ pos = subtitle->position();
}
}
+
+ return pos.get_value_or(ContentTime());
}
void
Decoder::seek (ContentTime, bool)
{
}
void
Decoder::seek (ContentTime, bool)
{
- _pending.clear ();
- _done = false;
+ if (audio) {
+ audio->seek ();
+ }
+ if (subtitle) {
+ subtitle->seek ();
+ }
}
}