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.h
diff --git
a/src/lib/decoder.h
b/src/lib/decoder.h
index aa36d41b496341ea7d8d66b8436171b11231e5b9..8b901f70cb4169632b9eaeab3dcb99dcbdc1a0a3 100644
(file)
--- a/
src/lib/decoder.h
+++ b/
src/lib/decoder.h
@@
-1,35
+1,39
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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.h
*/
/** @file src/decoder.h
- * @brief
Parent class for decoders of content
.
+ * @brief
Decoder class
.
*/
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
*/
#ifndef DCPOMATIC_DECODER_H
#define DCPOMATIC_DECODER_H
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/utility.hpp>
#include "types.h"
#include "types.h"
+#include "dcpomatic_time.h"
+#include <boost/utility.hpp>
-class Film;
+class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class SubtitleDecoder;
+class DecoderPart;
/** @class Decoder.
* @brief Parent class for decoders of content.
/** @class Decoder.
* @brief Parent class for decoders of content.
@@
-37,29
+41,19
@@
class Film;
class Decoder : public boost::noncopyable
{
public:
class Decoder : public boost::noncopyable
{
public:
- Decoder (boost::shared_ptr<const Film>);
virtual ~Decoder () {}
virtual ~Decoder () {}
- /** Perform one decode pass of the content, which may or may not
- * cause the object to emit some data.
- */
- virtual void pass () = 0;
+ boost::shared_ptr<VideoDecoder> video;
+ boost::shared_ptr<AudioDecoder> audio;
+ boost::shared_ptr<SubtitleDecoder> subtitle;
- /** Seek so that the next pass() will yield the next thing
- * (video/sound frame, subtitle etc.) at or after the requested
- * time. Pass accurate = true to try harder to get close to
- * the request.
+ /** Do some decoding and perhaps emit video, audio or subtitle data.
+ * @return true if this decoder will emit no more data unless a seek() happens.
*/
*/
- virtual void seek (DCPTime time, bool accurate) = 0;
-
- virtual bool done () const = 0;
-
-protected:
+ virtual bool pass () = 0;
+ virtual void seek (ContentTime time, bool accurate);
- virtual void flush () {};
-
- /** The Film that we are decoding in */
- boost::weak_ptr<const Film> _film;
+ virtual ContentTime position () const;
};
#endif
};
#endif