projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust how macOS drives are analysed and add a couple of tests.
[dcpomatic.git]
/
src
/
lib
/
filter.cc
diff --git
a/src/lib/filter.cc
b/src/lib/filter.cc
index 6869d26c99b582d60250870fc9613992eb28cc0a..5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8 100644
(file)
--- a/
src/lib/filter.cc
+++ b/
src/lib/filter.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,22
+18,30
@@
*/
*/
+
/** @file src/filter.cc
* @brief A class to describe one of FFmpeg's video or audio filters.
*/
/** @file src/filter.cc
* @brief A class to describe one of FFmpeg's video or audio filters.
*/
+
#include "filter.h"
#include "filter.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/avfilter.h>
}
extern "C" {
#include <libavfilter/avfilter.h>
}
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
+
using namespace std;
using namespace std;
+
vector<Filter const *> Filter::_filters;
vector<Filter const *> Filter::_filters;
+
/** @param i Our id.
* @param n User-visible name.
* @param c User-visible category.
/** @param i Our id.
* @param n User-visible name.
* @param c User-visible category.
@@
-48,6
+56,7
@@
Filter::Filter (string i, string n, string c, string f)
}
}
+
/** @return All available filters */
vector<Filter const *>
Filter::all ()
/** @return All available filters */
vector<Filter const *>
Filter::all ()
@@
-55,6
+64,7
@@
Filter::all ()
return _filters;
}
return _filters;
}
+
/** Set up the static _filters vector; must be called before from_*
* methods are used.
*/
/** Set up the static _filters vector; must be called before from_*
* methods are used.
*/
@@
-80,6
+90,7
@@
Filter::setup_filters ()
maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow"));
}
maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow"));
}
+
void
Filter::maybe_add (string i, string n, string c, string f)
{
void
Filter::maybe_add (string i, string n, string c, string f)
{
@@
-89,11
+100,12
@@
Filter::maybe_add (string i, string n, string c, string f)
check_name = check_name.substr (0, end);
}
check_name = check_name.substr (0, end);
}
- if (avfilter_get_by_name
(check_name.c_str())) {
- _filters.push_back (new Filter
(i, n, c, f));
+ if (avfilter_get_by_name(check_name.c_str())) {
+ _filters.push_back (new Filter(i, n, c, f));
}
}
}
}
+
/** @param filters Set of filters.
* @return String to pass to FFmpeg for the video filters.
*/
/** @param filters Set of filters.
* @return String to pass to FFmpeg for the video filters.
*/
@@
-112,19
+124,20
@@
Filter::ffmpeg_string (vector<Filter const *> const & filters)
return ff;
}
return ff;
}
+
/** @param d Our id.
* @return Corresponding Filter, or 0.
*/
Filter const *
Filter::from_id (string d)
{
/** @param d Our id.
* @return Corresponding Filter, or 0.
*/
Filter const *
Filter::from_id (string d)
{
-
vector<Filter const *>::iterator
i = _filters.begin ();
+
auto
i = _filters.begin ();
while (i != _filters.end() && (*i)->id() != d) {
++i;
}
if (i == _filters.end ()) {
while (i != _filters.end() && (*i)->id() != d) {
++i;
}
if (i == _filters.end ()) {
- return
0
;
+ return
nullptr
;
}
return *i;
}
return *i;