projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More player debugging for butler video-full states.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.cc
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index 243e9e97e40764f798ab62f8f51dd8d0d52439cd..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,10
+26,8
@@
#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/buffersink.h>
#include <libavformat/avio.h>
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
#include <libavformat/avio.h>
@@
-47,11
+46,7
@@
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 ()
: _graph (0)
, _copy (false)
FilterGraph::FilterGraph ()
: _graph (0)
, _copy (false)
@@
-78,12
+73,12
@@
FilterGraph::setup (vector<Filter const *> filters)
throw DecodeError (N_("could not create filter graph."));
}
throw DecodeError (N_("could not create filter graph."));
}
- AVFilter* buffer_src = avfilter_get_by_name (src_name().c_str());
+ AVFilter
const
* buffer_src = avfilter_get_by_name (src_name().c_str());
if (!buffer_src) {
throw DecodeError (N_("could not find buffer src filter"));
}
if (!buffer_src) {
throw DecodeError (N_("could not find buffer src filter"));
}
- AVFilter* buffer_sink = avfilter_get_by_name (sink_name().c_str());
+ AVFilter
const
* buffer_sink = avfilter_get_by_name (sink_name().c_str());
if (!buffer_sink) {
throw DecodeError (N_("Could not create buffer sink filter"));
}
if (!buffer_sink) {
throw DecodeError (N_("Could not create buffer sink filter"));
}
@@
-116,8
+111,9
@@
FilterGraph::setup (vector<Filter const *> filters)
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));
}
}
}
}