projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master and multifarious hackery.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.h
diff --git
a/src/lib/filter_graph.h
b/src/lib/filter_graph.h
index a4b9ef75fb68bd44ed9e9319d15359986c15c600..e294812c2baa9836f5aeff99711057bae611148e 100644
(file)
--- a/
src/lib/filter_graph.h
+++ b/
src/lib/filter_graph.h
@@
-21,14
+21,13
@@
* @brief A graph of FFmpeg filters.
*/
* @brief A graph of FFmpeg filters.
*/
-#ifndef D
VD
OMATIC_FILTER_GRAPH_H
-#define D
VD
OMATIC_FILTER_GRAPH_H
+#ifndef D
CP
OMATIC_FILTER_GRAPH_H
+#define D
CP
OMATIC_FILTER_GRAPH_H
#include "util.h"
class Image;
class VideoFilter;
#include "util.h"
class Image;
class VideoFilter;
-class FFmpegDecoder;
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
@@
-36,16
+35,18
@@
class FFmpegDecoder;
class FilterGraph
{
public:
class FilterGraph
{
public:
- FilterGraph (boost::shared_ptr<Film> film, FFmpegDecoder* decoder, Size s, AVPixelFormat p);
+ FilterGraph (boost::shared_ptr<const FFmpegContent> content, libdcp::Size s, AVPixelFormat p);
+ ~FilterGraph ();
- bool can_process (Size s, AVPixelFormat p) const;
- std::list<boost::shared_ptr<Image> > process (AVFrame
const
* frame);
+ bool can_process (
libdcp::
Size s, AVPixelFormat p) const;
+ std::list<boost::shared_ptr<Image> > process (AVFrame * frame);
private:
AVFilterContext* _buffer_src_context;
AVFilterContext* _buffer_sink_context;
private:
AVFilterContext* _buffer_src_context;
AVFilterContext* _buffer_sink_context;
- Size _size; ///< size of the images that this chain can process
+
libdcp::
Size _size; ///< size of the images that this chain can process
AVPixelFormat _pixel_format; ///< pixel format of the images that this chain can process
AVPixelFormat _pixel_format; ///< pixel format of the images that this chain can process
+ AVFrame* _frame;
};
#endif
};
#endif