projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copy DCP name layout fix from master.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index f5c3cd743ba43bf3df96d4a1706507a33a0e3a95..5381fb21ec72a83717ca9b6f7e3368532cb3d48b 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-24,15
+24,16
@@
#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 <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
class VideoContent;
class ImageProxy;
class VideoContent;
class ImageProxy;
+class Image;
/** @class VideoDecoder
* @brief Parent for classes which decode video.
/** @class VideoDecoder
* @brief Parent for classes which decode video.
@@
-48,19
+49,30
@@
public:
return _video_content;
}
return _video_content;
}
+ void set_ignore_video ();
+
#ifdef DCPOMATIC_DEBUG
int test_gaps;
#endif
protected:
#ifdef DCPOMATIC_DEBUG
int test_gaps;
#endif
protected:
+ friend struct video_decoder_fill_test1;
+ friend struct video_decoder_fill_test2;
void seek (ContentTime time, bool accurate);
void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
std::list<ContentVideo> decoded_video (VideoFrame frame);
void seek (ContentTime time, bool accurate);
void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
std::list<ContentVideo> decoded_video (VideoFrame frame);
+ void fill_2d (VideoFrame from, VideoFrame to);
+ void fill_3d (VideoFrame from, VideoFrame to, Eyes);
boost::shared_ptr<const VideoContent> _video_content;
std::list<ContentVideo> _decoded_video;
boost::shared_ptr<const VideoContent> _video_content;
std::list<ContentVideo> _decoded_video;
- bool _same;
+ boost::shared_ptr<Image> _black_image;
+ boost::optional<ContentTime> _last_seek_time;
+ bool _last_seek_accurate;
+
+ /** true if this decoder should ignore all video; i.e. never produce any */
+ bool _ignore_video;
};
#endif
};
#endif