projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg to 5.1.2 "Riemann"
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index f5c3cd743ba43bf3df96d4a1706507a33a0e3a95..f6ee17425b6d77b48d6b074c5d369f6cfbd888c3 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-1,66
+1,76
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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/lib/video_decoder.h
* @brief VideoDecoder class.
*/
/** @file src/lib/video_decoder.h
* @brief VideoDecoder class.
*/
+
#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
"content_video.h"
#include "decoder.h"
#include "decoder.h"
+#include "decoder_part.h"
#include "video_content.h"
#include "video_content.h"
-#include
"util.h"
-#include "content_video.h"
+#include
<boost/signals2.hpp>
+
class VideoContent;
class ImageProxy;
class VideoContent;
class ImageProxy;
+class Image;
+class Log;
+class FrameIntervalChecker;
+
/** @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, std::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
;
+ boost::
optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override
{
+ return _
position
;
}
}
-#ifdef DCPOMATIC_DEBUG
- int test_gaps;
-#endif
-
-protected:
+ void seek () override;
+ void emit (std::shared_ptr<const Film> film, std::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);
+ boost::signals2::signal<void (ContentVideo)> Data;
- boost::shared_ptr<const VideoContent> _video_content;
- std::list<ContentVideo> _decoded_video;
- bool _same;
+private:
+ std::shared_ptr<const Content> _content;
+ /** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */
+ boost::optional<Eyes> _last_emitted_eyes;
+ boost::optional<dcpomatic::ContentTime> _position;
+ boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
};
};
+
#endif
#endif