projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More header trimming.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.h
diff --git
a/src/lib/filter_graph.h
b/src/lib/filter_graph.h
index d5a2da7a29be925cbbb6e572544a8390dd2c57ba..d56f15296bf608d6daf8c30ff8f576fa8c372f9d 100644
(file)
--- a/
src/lib/filter_graph.h
+++ b/
src/lib/filter_graph.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,33
+18,39
@@
*/
*/
+
/** @file src/lib/filter_graph.h
* @brief A graph of FFmpeg filters.
*/
/** @file src/lib/filter_graph.h
* @brief A graph of FFmpeg filters.
*/
+
#ifndef DCPOMATIC_FILTER_GRAPH_H
#define DCPOMATIC_FILTER_GRAPH_H
#ifndef DCPOMATIC_FILTER_GRAPH_H
#define DCPOMATIC_FILTER_GRAPH_H
-#include "util.h"
-#include
"warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/buffersink.h>
}
extern "C" {
#include <libavfilter/buffersink.h>
}
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+#include <string>
+#include <vector>
+
struct AVFilterContext;
struct AVFrame;
class Image;
class Filter;
struct AVFilterContext;
struct AVFrame;
class Image;
class Filter;
+
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
*/
class FilterGraph
{
public:
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
*/
class FilterGraph
{
public:
- FilterGraph
()
;
+ FilterGraph
() = default
;
virtual ~FilterGraph ();
FilterGraph (FilterGraph const&) = delete;
virtual ~FilterGraph ();
FilterGraph (FilterGraph const&) = delete;
@@
-59,12
+65,13
@@
protected:
virtual void set_parameters (AVFilterContext* context) const = 0;
virtual std::string sink_name () const = 0;
virtual void set_parameters (AVFilterContext* context) const = 0;
virtual std::string sink_name () const = 0;
- AVFilterGraph* _graph;
+ AVFilterGraph* _graph
= nullptr
;
/** true if this graph has no filters in, so it just copies stuff straight through */
/** true if this graph has no filters in, so it just copies stuff straight through */
- bool _copy;
- AVFilterContext* _buffer_src_context;
- AVFilterContext* _buffer_sink_context;
- AVFrame* _frame;
+ bool _copy
= false
;
+ AVFilterContext* _buffer_src_context
= nullptr
;
+ AVFilterContext* _buffer_sink_context
= nullptr
;
+ AVFrame* _frame
= nullptr
;
};
};
+
#endif
#endif