projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ISDCF name fixes with > 6 channels and HI/VI (#1633).
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index f5c3cd743ba43bf3df96d4a1706507a33a0e3a95..76a91c5255bac1c26c4aa5d25ad3f6daa61f2ddb 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
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/>.
*/
*/
@@
-24,43
+25,48
@@
#ifndef DCPOMATIC_VIDEO_DECODER_H
#define DCPOMATIC_VIDEO_DECODER_H
#ifndef DCPOMATIC_VIDEO_DECODER_H
#define DCPOMATIC_VIDEO_DECODER_H
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
#include "decoder.h"
#include "video_content.h"
#include "util.h"
#include "content_video.h"
#include "decoder.h"
#include "video_content.h"
#include "util.h"
#include "content_video.h"
+#include "decoder_part.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
class VideoContent;
class ImageProxy;
class VideoContent;
class ImageProxy;
+class Image;
+class Log;
/** @class VideoDecoder
* @brief Parent for classes which decode video.
*/
/** @class VideoDecoder
* @brief Parent for classes which decode video.
*/
-class VideoDecoder : public
virtual Decoder
+class VideoDecoder : public
DecoderPart
{
public:
{
public:
- VideoDecoder (
boost::shared_ptr<const Video
Content> c);
+ VideoDecoder (
Decoder* parent, boost::shared_ptr<const
Content> c);
- std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+ friend struct video_decoder_fill_test1;
+ friend struct video_decoder_fill_test2;
+ friend struct ffmpeg_pts_offset_test;
+ friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
-
boost::shared_ptr<const VideoContent> video_content (
) const {
- return _
video_content
;
+
dcpomatic::ContentTime position (boost::shared_ptr<const Film>
) const {
+ return _
position
;
}
}
-#ifdef DCPOMATIC_DEBUG
- int test_gaps;
-#endif
-
-protected:
+ void seek ();
+ void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
- void seek (ContentTime time, bool accurate);
- void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
- std::list<ContentVideo> decoded_video (VideoFrame frame);
+ /** @return true if the emitted data was accepted, false if not */
+ boost::signals2::signal<void (ContentVideo)> Data;
- boost::shared_ptr<const VideoContent> _video_content;
- std::list<ContentVideo> _decoded_video;
- bool _same;
+private:
+ boost::shared_ptr<const Content> _content;
+ /** Frame of last thing to be emitted */
+ boost::optional<Frame> _last_emitted_frame;
+ boost::optional<Eyes> _last_emitted_eyes;
+ dcpomatic::ContentTime _position;
};
#endif
};
#endif