projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unnecessary re-writes of video assets if they are staying the same (#1638).
[dcpomatic.git]
/
src
/
lib
/
filter_graph.cc
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index 3efb6970cbf75d893428cc5f76f963cfa2d186fe..daceeaf2d96924b97fb5af633927e73e04fdd2f7 100644
(file)
--- a/
src/lib/filter_graph.cc
+++ b/
src/lib/filter_graph.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 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/>.
*/
*/
@@
-25,12
+26,9
@@
#include "filter.h"
#include "exceptions.h"
#include "image.h"
#include "filter.h"
#include "exceptions.h"
#include "image.h"
-#include "safe_stringstream.h"
#include "compose.hpp"
extern "C" {
#include "compose.hpp"
extern "C" {
-#include <libavfilter/avfiltergraph.h>
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersrc.h>
-#include <libavfilter/avcodec.h>
#include <libavfilter/buffersink.h>
#include <libavformat/avio.h>
}
#include <libavfilter/buffersink.h>
#include <libavformat/avio.h>
}
@@
-48,13
+46,10
@@
using boost::shared_ptr;
using boost::weak_ptr;
using dcp::Size;
using boost::weak_ptr;
using dcp::Size;
-/** Construct a FilterGraph for the settings in a piece of content.
- * @param content Content.
- * @param s Size of the images to process.
- * @param p Pixel format of the images to process.
- */
+/** Construct a FilterGraph for the settings in a piece of content */
FilterGraph::FilterGraph ()
FilterGraph::FilterGraph ()
- : _copy (false)
+ : _graph (0)
+ , _copy (false)
, _buffer_src_context (0)
, _buffer_sink_context (0)
, _frame (0)
, _buffer_src_context (0)
, _buffer_sink_context (0)
, _frame (0)
@@
-73,28
+68,28
@@
FilterGraph::setup (vector<Filter const *> filters)
_frame = av_frame_alloc ();
_frame = av_frame_alloc ();
-
AVFilterGraph*
graph = avfilter_graph_alloc();
- if (
graph == 0
) {
+
_
graph = avfilter_graph_alloc();
+ if (
!_graph
) {
throw DecodeError (N_("could not create filter graph."));
}
throw DecodeError (N_("could not create filter graph."));
}
- AVFilter
* buffer_src = avfilter_get_by_name(N_("buffer"
));
- if (
buffer_src == 0
) {
+ AVFilter
const * buffer_src = avfilter_get_by_name (src_name().c_str(
));
+ if (
!buffer_src
) {
throw DecodeError (N_("could not find buffer src filter"));
}
throw DecodeError (N_("could not find buffer src filter"));
}
- AVFilter
* buffer_sink = avfilter_get_by_name(N_("buffersink"
));
- if (
buffer_sink == 0
) {
+ AVFilter
const * buffer_sink = avfilter_get_by_name (sink_name().c_str(
));
+ if (
!buffer_sink
) {
throw DecodeError (N_("Could not create buffer sink filter"));
}
throw DecodeError (N_("Could not create buffer sink filter"));
}
- if (avfilter_graph_create_filter (&_buffer_src_context, buffer_src,
"in", src_parameters().c_str(), 0,
graph) < 0) {
+ if (avfilter_graph_create_filter (&_buffer_src_context, buffer_src,
N_("in"), src_parameters().c_str(), 0, _
graph) < 0) {
throw DecodeError (N_("could not create buffer source"));
}
throw DecodeError (N_("could not create buffer source"));
}
-
AVBufferSinkParams
* sink_params = sink_parameters ();
+
void
* sink_params = sink_parameters ();
- if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
+ if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params,
_
graph) < 0) {
throw DecodeError (N_("could not create buffer sink."));
}
throw DecodeError (N_("could not create buffer sink."));
}
@@
-112,12
+107,13
@@
FilterGraph::setup (vector<Filter const *> filters)
inputs->pad_idx = 0;
inputs->next = 0;
inputs->pad_idx = 0;
inputs->next = 0;
- if (avfilter_graph_parse (graph, filters_string.c_str(), inputs, outputs, 0) < 0) {
+ if (avfilter_graph_parse (
_
graph, filters_string.c_str(), inputs, outputs, 0) < 0) {
throw DecodeError (N_("could not set up filter graph."));
}
throw DecodeError (N_("could not set up filter graph."));
}
- if (avfilter_graph_config (graph, 0) < 0) {
- throw DecodeError (N_("could not configure filter graph."));
+ int e = avfilter_graph_config (_graph, 0);
+ if (e < 0) {
+ throw DecodeError (String::compose (N_("could not configure filter graph (%1)"), e));
}
}
}
}
@@
-126,4
+122,14
@@
FilterGraph::~FilterGraph ()
if (_frame) {
av_frame_free (&_frame);
}
if (_frame) {
av_frame_free (&_frame);
}
+
+ if (_graph) {
+ avfilter_graph_free (&_graph);
+ }
+}
+
+AVFilterContext *
+FilterGraph::get (string name)
+{
+ return avfilter_graph_get_filter (_graph, name.c_str ());
}
}